Re: [GIT] Security subsystem fixes for 3.4

[James Morris]

The fcaps patch introduced a build error for some users, sorry.

Please pull the fix below.



The following changes since commit b6a89584c36f307f2c2bbb136ea50985ca4bc7b4:
  Linus Torvalds (1):
        Merge branch 'for-linus' of git://git.kernel.org/.../jmorris/linux-security

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git for-linus

Jonghwan Choi (1):
      security: fix compile error in commoncap.c

 security/commoncap.c |    1 +
 1 file changed, 1 insertion(+)

commit 51b79bee627d526199b2f6a6bef8ee0c0739b6d1
Author: Jonghwan Choi <jhbird.choi@xxxxxxxxxxx>
Date:   Wed Apr 18 17:23:04 2012 -0400

    security: fix compile error in commoncap.c
    
    Add missing "personality.h"
    security/commoncap.c: In function 'cap_bprm_set_creds':
    security/commoncap.c:510: error: 'PER_CLEAR_ON_SETID' undeclared (first use in this function)
    security/commoncap.c:510: error: (Each undeclared identifier is reported only once
    security/commoncap.c:510: error: for each function it appears in.)
    
    Signed-off-by: Jonghwan Choi <jhbird.choi@xxxxxxxxxxx>
    Acked-by: Serge Hallyn <serge.hallyn@xxxxxxxxxxxxx>
    Signed-off-by: James Morris <james.l.morris@xxxxxxxxxx>

diff --git a/security/commoncap.c b/security/commoncap.c
index 0ecf4ba..71a166a 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -29,6 +29,7 @@
 #include <linux/securebits.h>
 #include <linux/user_namespace.h>
 #include <linux/binfmts.h>
+#include <linux/personality.h>
 
 /*
  * If a non-root user executes a setuid-root binary in
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/