From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 31 Jul 2015 17:32:32 +0000 (-0700)
Subject: fix build of evm patch for 3.14
X-Git-Tag: v4.1.4~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=52859b394446d3695be243b5582b2a36e050786e;p=thirdparty%2Fkernel%2Fstable-queue.git

fix build of evm patch for 3.14
---

diff --git a/queue-3.14/evm-labeling-pseudo-filesystems-exception.patch b/queue-3.14/evm-labeling-pseudo-filesystems-exception.patch
index 3fedc669c6d..abd248f62e3 100644
--- a/queue-3.14/evm-labeling-pseudo-filesystems-exception.patch
+++ b/queue-3.14/evm-labeling-pseudo-filesystems-exception.patch
@@ -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 |   11 +++++++++++
- 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;