]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fix build of evm patch for 3.14
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 31 Jul 2015 17:32:32 +0000 (10:32 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 31 Jul 2015 17:32:32 +0000 (10:32 -0700)
queue-3.14/evm-labeling-pseudo-filesystems-exception.patch

index 3fedc669c6d8f5470c1f32f19c761f9bf8a5f5e3..abd248f62e39344a6c489069c5313bdb316fb7c1 100644 (file)
@@ -19,12 +19,20 @@ Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
- security/integrity/evm/evm_main.c |   1+++++++++++
- 1 file changed, 11 insertions(+)
+ security/integrity/evm/evm_main.c |   12 ++++++++++++
+ 1 file changed, 12 insertions(+)
 
 --- a/security/integrity/evm/evm_main.c
 +++ b/security/integrity/evm/evm_main.c
-@@ -275,6 +275,17 @@ static int evm_protect_xattr(struct dent
+@@ -20,6 +20,7 @@
+ #include <linux/xattr.h>
+ #include <linux/integrity.h>
+ #include <linux/evm.h>
++#include <linux/magic.h>
+ #include <crypto/hash.h>
+ #include "evm.h"
+@@ -275,6 +276,17 @@ static int evm_protect_xattr(struct dent
                iint = integrity_iint_find(dentry->d_inode);
                if (iint && (iint->flags & IMA_NEW_FILE))
                        return 0;