Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
James Morris [Tue, 22 May 2012 01:21:06 +0000 (11:21 +1000)]
Per pull request, for 3.5.

1  2 
include/linux/security.h
security/apparmor/policy.c
security/selinux/hooks.c
security/smack/smack.h
security/smack/smack_lsm.c

Simple merge
Simple merge
@@@ -2032,12 -1995,10 +2002,11 @@@ static int selinux_bprm_set_creds(struc
                        return rc;
        }
  
-       COMMON_AUDIT_DATA_INIT(&ad, PATH);
-       ad.selinux_audit_data = &sad;
+       ad.type = LSM_AUDIT_DATA_PATH;
        ad.u.path = bprm->file->f_path;
  
 -      if (bprm->file->f_path.mnt->mnt_flags & MNT_NOSUID)
 +      if ((bprm->file->f_path.mnt->mnt_flags & MNT_NOSUID) ||
 +          (bprm->unsafe & LSM_UNSAFE_NO_NEW_PRIVS))
                new_tsec->sid = old_tsec->sid;
  
        if (new_tsec->sid == old_tsec->sid) {
Simple merge
Simple merge