ima changes to shmem breaks !CONFIG_SHMEM

ima changes to shmem breaks !CONFIG_SHMEM

[Mike Frysinger]

commit 1df9f0a73178718969ae47d813b8e7aab2cf073c broke default building
for Blackfin systems:
  CC      mm/shmem.o
mm/shmem.c: In function 'shmem_zero_setup':
mm/shmem.c:2670: error: implicit declaration of function 'ima_shm_check'
make[1]: *** [mm/shmem.o] Error 1

that's because the ima.h include was added behind the CONFIG_SHMEM
markings rather than everywhere, just like the function is used.
-mike

Re: ima changes to shmem breaks !CONFIG_SHMEM

[James Morris]

On Mon, 9 Feb 2009, Mike Frysinger wrote:

> commit 1df9f0a73178718969ae47d813b8e7aab2cf073c broke default building
> for Blackfin systems:
>   CC      mm/shmem.o
> mm/shmem.c: In function 'shmem_zero_setup':
> mm/shmem.c:2670: error: implicit declaration of function 'ima_shm_check'
> make[1]: *** [mm/shmem.o] Error 1
> 
> that's because the ima.h include was added behind the CONFIG_SHMEM
> markings rather than everywhere, just like the function is used.

Does this seem like the correct fix?

--- 

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>

Re: ima changes to shmem breaks !CONFIG_SHMEM

[Mike Frysinger]

On Mon, Feb 9, 2009 at 16:23, James Morris wrote:
> On Mon, 9 Feb 2009, Mike Frysinger wrote:
>> commit 1df9f0a73178718969ae47d813b8e7aab2cf073c broke default building
>> for Blackfin systems:
>>   CC      mm/shmem.o
>> mm/shmem.c: In function 'shmem_zero_setup':
>> mm/shmem.c:2670: error: implicit declaration of function 'ima_shm_check'
>> make[1]: *** [mm/shmem.o] Error 1
>>
>> that's because the ima.h include was added behind the CONFIG_SHMEM
>> markings rather than everywhere, just like the function is used.
>
> Does this seem like the correct fix?

it converts the build error to a build warning:
  CC      mm/shmem.o
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
-mike

Re: ima changes to shmem breaks !CONFIG_SHMEM

[Randy Dunlap]

Mike Frysinger wrote:
> On Mon, Feb 9, 2009 at 16:23, James Morris wrote:
>> On Mon, 9 Feb 2009, Mike Frysinger wrote:
>>> commit 1df9f0a73178718969ae47d813b8e7aab2cf073c broke default building
>>> for Blackfin systems:
>>>   CC      mm/shmem.o
>>> mm/shmem.c: In function 'shmem_zero_setup':
>>> mm/shmem.c:2670: error: implicit declaration of function 'ima_shm_check'
>>> make[1]: *** [mm/shmem.o] Error 1
>>>
>>> that's because the ima.h include was added behind the CONFIG_SHMEM
>>> markings rather than everywhere, just like the function is used.
>> Does this seem like the correct fix?
> 
> it converts the build error to a build warning:
>   CC      mm/shmem.o
> 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

Add to the other patch:

--- linux-next-20090209.orig/include/linux/ima.h
+++ linux-next-20090209/include/linux/ima.h
@@ -8,6 +8,7 @@
  */
 
 #include <linux/fs.h>
+struct linux_binprm;
 
 #ifndef _LINUX_IMA_H
 #define _LINUX_IMA_H



and it builds for me.

-- 
~Randy

Re: ima changes to shmem breaks !CONFIG_SHMEM

[Mike Frysinger]

On Mon, Feb 9, 2009 at 16:49, Randy Dunlap wrote:
> Mike Frysinger wrote:
>> On Mon, Feb 9, 2009 at 16:23, James Morris wrote:
>>> On Mon, 9 Feb 2009, Mike Frysinger wrote:
>>>> commit 1df9f0a73178718969ae47d813b8e7aab2cf073c broke default building
>>>> for Blackfin systems:
>>>>   CC      mm/shmem.o
>>>> mm/shmem.c: In function 'shmem_zero_setup':
>>>> mm/shmem.c:2670: error: implicit declaration of function 'ima_shm_check'
>>>> make[1]: *** [mm/shmem.o] Error 1
>>>>
>>>> that's because the ima.h include was added behind the CONFIG_SHMEM
>>>> markings rather than everywhere, just like the function is used.
>>> Does this seem like the correct fix?
>>
>> it converts the build error to a build warning:
>>   CC      mm/shmem.o
>> 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
>
> Add to the other patch:
>
> --- linux-next-20090209.orig/include/linux/ima.h
> +++ linux-next-20090209/include/linux/ima.h
> @@ -8,6 +8,7 @@
>  */
>
>  #include <linux/fs.h>
> +struct linux_binprm;
>
>  #ifndef _LINUX_IMA_H
>  #define _LINUX_IMA_H
>
>
>
> and it builds for me.

yes, it builds w/out warnings now for me too.  any reason those are
outside of _LINUX_IMA_H ?  looks like they should both be inside of
that.
-mike

Re: ima changes to shmem breaks !CONFIG_SHMEM

[Randy Dunlap]

Mike Frysinger wrote:
> On Mon, Feb 9, 2009 at 16:49, Randy Dunlap wrote:
>> Mike Frysinger wrote:
>>> On Mon, Feb 9, 2009 at 16:23, James Morris wrote:
>>>> On Mon, 9 Feb 2009, Mike Frysinger wrote:
>>>>> commit 1df9f0a73178718969ae47d813b8e7aab2cf073c broke default building
>>>>> for Blackfin systems:
>>>>>   CC      mm/shmem.o
>>>>> mm/shmem.c: In function 'shmem_zero_setup':
>>>>> mm/shmem.c:2670: error: implicit declaration of function 'ima_shm_check'
>>>>> make[1]: *** [mm/shmem.o] Error 1
>>>>>
>>>>> that's because the ima.h include was added behind the CONFIG_SHMEM
>>>>> markings rather than everywhere, just like the function is used.
>>>> Does this seem like the correct fix?
>>> it converts the build error to a build warning:
>>>   CC      mm/shmem.o
>>> 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
>> Add to the other patch:
>>
>> --- linux-next-20090209.orig/include/linux/ima.h
>> +++ linux-next-20090209/include/linux/ima.h
>> @@ -8,6 +8,7 @@
>>  */
>>
>>  #include <linux/fs.h>
>> +struct linux_binprm;
>>
>>  #ifndef _LINUX_IMA_H
>>  #define _LINUX_IMA_H
>>
>>
>>
>> and it builds for me.
> 
> yes, it builds w/out warnings now for me too.  any reason those are
> outside of _LINUX_IMA_H ?  looks like they should both be inside of
> that.

Agreed, that change is also good.


Thanks.
-- 
~Randy

Re: ima changes to shmem breaks !CONFIG_SHMEM

[Mimi Zohar]

On Mon, 2009-02-09 at 13:56 -0800, Randy Dunlap wrote:
> Mike Frysinger wrote:
> > On Mon, Feb 9, 2009 at 16:49, Randy Dunlap wrote:
> >> Mike Frysinger wrote:
> >>> On Mon, Feb 9, 2009 at 16:23, James Morris wrote:
> >>>> On Mon, 9 Feb 2009, Mike Frysinger wrote:
> >>>>> commit 1df9f0a73178718969ae47d813b8e7aab2cf073c broke default building
> >>>>> for Blackfin systems:
> >>>>>   CC      mm/shmem.o
> >>>>> mm/shmem.c: In function 'shmem_zero_setup':
> >>>>> mm/shmem.c:2670: error: implicit declaration of function 'ima_shm_check'
> >>>>> make[1]: *** [mm/shmem.o] Error 1
> >>>>>
> >>>>> that's because the ima.h include was added behind the CONFIG_SHMEM
> >>>>> markings rather than everywhere, just like the function is used.
> >>>> Does this seem like the correct fix?
> >>> it converts the build error to a build warning:
> >>>   CC      mm/shmem.o
> >>> 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
> >> Add to the other patch:
> >>
> >> --- linux-next-20090209.orig/include/linux/ima.h
> >> +++ linux-next-20090209/include/linux/ima.h
> >> @@ -8,6 +8,7 @@
> >>  */
> >>
> >>  #include <linux/fs.h>
> >> +struct linux_binprm;
> >>
> >>  #ifndef _LINUX_IMA_H
> >>  #define _LINUX_IMA_H
> >>
> >>
> >>
> >> and it builds for me.
> > 
> > yes, it builds w/out warnings now for me too.  any reason those are
> > outside of _LINUX_IMA_H ?  looks like they should both be inside of
> > that.
> 
> Agreed, that change is also good.
> 
> 
> Thanks.

I posted the patch, forgetting to copy both Mike and you.  Could you
please verify the patch resolves the problem.

Thanks!

Mimi