[PATCH] integrity: shmem zero fix

[PATCH] integrity: shmem zero fix

[Mimi Zohar]

Based on comments from Mike Frysinger and Randy Dunlap:
(http://lkml.org/lkml/2009/2/9/262)
- moved ima.h include before CONFIG_SHMEM test to fix compiler error 
  on Blackfin: 
mm/shmem.c: In function 'shmem_zero_setup':
mm/shmem.c:2670: error: implicit declaration of function 'ima_shm_check'

- added 'struct linux_binprm' in ima.h to fix compiler warning on Blackfin:
In file included from mm/shmem.c:32:
include/linux/ima.h:25: warning: 'struct linux_binprm' declared inside
parameter list
include/linux/ima.h:25: warning: its scope is only this definition or
declaration, which is probably not what you want

- moved fs.h include within _LINUX_IMA_H definition

Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
---
diff --git a/include/linux/ima.h b/include/linux/ima.h
index 6db30a3..0e2aa45 100644
--- a/include/linux/ima.h
+++ b/include/linux/ima.h
@@ -7,11 +7,12 @@
  * the Free Software Foundation, version 2 of the License.
  */
 
-#include <linux/fs.h>
-
 #ifndef _LINUX_IMA_H
 #define _LINUX_IMA_H
 
+#include <linux/fs.h>
+struct linux_binprm;
+
 #ifdef CONFIG_IMA
 extern int ima_bprm_check(struct linux_binprm *bprm);
 extern int ima_inode_alloc(struct inode *inode);
diff --git a/mm/shmem.c b/mm/shmem.c
index 7519988..8135fac 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -28,6 +28,7 @@
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/swap.h>
+#include <linux/ima.h>
 
 static struct vfsmount *shm_mnt;
 
@@ -59,7 +60,6 @@ static struct vfsmount *shm_mnt;
 #include <linux/highmem.h>
 #include <linux/seq_file.h>
 #include <linux/magic.h>
-#include <linux/ima.h>
 
 #include <asm/uaccess.h>
 #include <asm/div64.h>
-- 
1.5.6.6

Re: [PATCH] integrity: shmem zero fix

[Mike Frysinger]

On Tue, Feb 10, 2009 at 23:01, Mimi Zohar wrote:
> Based on comments from Mike Frysinger and Randy Dunlap:
> (http://lkml.org/lkml/2009/2/9/262)
> - moved ima.h include before CONFIG_SHMEM test to fix compiler error
>  on Blackfin:
> mm/shmem.c: In function 'shmem_zero_setup':
> mm/shmem.c:2670: error: implicit declaration of function 'ima_shm_check'
>
> - added 'struct linux_binprm' in ima.h to fix compiler warning on Blackfin:
> In file included from mm/shmem.c:32:
> include/linux/ima.h:25: warning: 'struct linux_binprm' declared inside
> parameter list
> include/linux/ima.h:25: warning: its scope is only this definition or
> declaration, which is probably not what you want
>
> - moved fs.h include within _LINUX_IMA_H definition
>
> Signed-off-by: Mimi Zohar <zohar@us.ibm.com>

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-mike

Re: [PATCH] integrity: shmem zero fix

[James Morris]

On Tue, 10 Feb 2009, Mike Frysinger wrote:

> On Tue, Feb 10, 2009 at 23:01, Mimi Zohar wrote:
> > Based on comments from Mike Frysinger and Randy Dunlap:
> > (http://lkml.org/lkml/2009/2/9/262)
> > - moved ima.h include before CONFIG_SHMEM test to fix compiler error
> >  on Blackfin:
> > mm/shmem.c: In function 'shmem_zero_setup':
> > mm/shmem.c:2670: error: implicit declaration of function 'ima_shm_check'
> >
> > - added 'struct linux_binprm' in ima.h to fix compiler warning on Blackfin:
> > In file included from mm/shmem.c:32:
> > include/linux/ima.h:25: warning: 'struct linux_binprm' declared inside
> > parameter list
> > include/linux/ima.h:25: warning: its scope is only this definition or
> > declaration, which is probably not what you want
> >
> > - moved fs.h include within _LINUX_IMA_H definition
> >
> > Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
> 
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>

Applied to 
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next

-- 
James Morris
<jmorris@namei.org>

Re: [PATCH] integrity: shmem zero fix

[Andrew Morton]

On Mon, 9 Feb 2009 19:03:51 -0500
Mike Frysinger <vapier.adi@gmail.com> wrote:

> On Mon, Feb 9, 2009 at 18:02, Mimi Zohar wrote:
> > Based on comments from Mike Frysinger and Randy Dunlap,
> > - moved ima.h include before CONFIG_SHMEM test
> > - added 'struct linux_binprm' in ima.h
> 
> please move the linux/fs.h include in linux/ima.h to match
> linux_binprm location while you're at it

Please write a full changelog too.  That one didn't tell us what
was being fixed.

As it is presumably a compilation fix, please include the compiler
error messages in the changelog, along with a description of what
circumstances cause the error to occur.

Thanks.

[PATCH] integrity: shmem zero fix

[Mimi Zohar]

Based on comments from Mike Frysinger and Randy Dunlap,
- moved ima.h include before CONFIG_SHMEM test
- added 'struct linux_binprm' in ima.h
- moved fs.h include within _LINUX_IMA_H definition

Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
---
diff --git a/include/linux/ima.h b/include/linux/ima.h
index 6db30a3..0e2aa45 100644
--- a/include/linux/ima.h
+++ b/include/linux/ima.h
@@ -7,11 +7,12 @@
  * the Free Software Foundation, version 2 of the License.
  */
 
-#include <linux/fs.h>
-
 #ifndef _LINUX_IMA_H
 #define _LINUX_IMA_H
 
+#include <linux/fs.h>
+struct linux_binprm;
+
 #ifdef CONFIG_IMA
 extern int ima_bprm_check(struct linux_binprm *bprm);
 extern int ima_inode_alloc(struct inode *inode);
diff --git a/mm/shmem.c b/mm/shmem.c
index 7519988..8135fac 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -28,6 +28,7 @@
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/swap.h>
+#include <linux/ima.h>
 
 static struct vfsmount *shm_mnt;
 
@@ -59,7 +60,6 @@ static struct vfsmount *shm_mnt;
 #include <linux/highmem.h>
 #include <linux/seq_file.h>
 #include <linux/magic.h>
-#include <linux/ima.h>
 
 #include <asm/uaccess.h>
 #include <asm/div64.h>
-- 
1.5.6.6

Re: [PATCH] integrity: shmem zero fix

[Randy Dunlap]

Mike Frysinger wrote:
> On Mon, Feb 9, 2009 at 18:02, Mimi Zohar wrote:
>> Based on comments from Mike Frysinger and Randy Dunlap,
>> - moved ima.h include before CONFIG_SHMEM test
>> - added 'struct linux_binprm' in ima.h
> 
> please move the linux/fs.h include in linux/ima.h to match
> linux_binprm location while you're at it

Yes, that's the only difference with what I tested:

-#include <linux/fs.h>
-
 #ifndef _LINUX_IMA_H
 #define _LINUX_IMA_H
 
+#include <linux/fs.h>
+struct linux_binprm;
+




-- 
~Randy

Re: [PATCH] integrity: shmem zero fix

[Mike Frysinger]

On Mon, Feb 9, 2009 at 18:02, Mimi Zohar wrote:
> Based on comments from Mike Frysinger and Randy Dunlap,
> - moved ima.h include before CONFIG_SHMEM test
> - added 'struct linux_binprm' in ima.h

please move the linux/fs.h include in linux/ima.h to match
linux_binprm location while you're at it
-mike

[PATCH] integrity: shmem zero fix

[Mimi Zohar]

Based on comments from Mike Frysinger and Randy Dunlap,
- moved ima.h include before CONFIG_SHMEM test
- added 'struct linux_binprm' in ima.h

Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
---
diff --git a/include/linux/ima.h b/include/linux/ima.h
index 6db30a3..7018ee8 100644
--- a/include/linux/ima.h
+++ b/include/linux/ima.h
@@ -12,6 +12,8 @@
 #ifndef _LINUX_IMA_H
 #define _LINUX_IMA_H
 
+struct linux_binprm;
+
 #ifdef CONFIG_IMA
 extern int ima_bprm_check(struct linux_binprm *bprm);
 extern int ima_inode_alloc(struct inode *inode);
diff --git a/mm/shmem.c b/mm/shmem.c
index 7519988..8135fac 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -28,6 +28,7 @@
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/swap.h>
+#include <linux/ima.h>
 
 static struct vfsmount *shm_mnt;
 
@@ -59,7 +60,6 @@ static struct vfsmount *shm_mnt;
 #include <linux/highmem.h>
 #include <linux/seq_file.h>
 #include <linux/magic.h>
-#include <linux/ima.h>
 
 #include <asm/uaccess.h>
 #include <asm/div64.h>
-- 
1.5.6.6