Commit ed850a52 authored Feb 10, 2009 by Mimi Zohar Committed by James Morris Feb 11, 2009

integrity: shmem zero fix

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>
Signed-off-by: James Morris <jmorris@namei.org>

parent cb5629b1

include/linux/ima.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -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);

mm/shmem.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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>