aboutsummaryrefslogtreecommitdiffstats
path: root/mm/shmem.c
diff options
context:
space:
mode:
authorMimi Zohar <zohar@linux.vnet.ibm.com>2009-02-04 09:07:02 -0500
committerJames Morris <jmorris@namei.org>2009-02-05 17:05:33 -0500
commit1df9f0a73178718969ae47d813b8e7aab2cf073c (patch)
tree6bd3d8838858f0e93acd8f7969b7d0e5ce2bfb08 /mm/shmem.c
parentf4bd857bc8ed997c25ec06b56ef8064aafa6d4f3 (diff)
Integrity: IMA file free imbalance
The number of calls to ima_path_check()/ima_file_free() should be balanced. An extra call to fput(), indicates the file could have been accessed without first being measured. Although f_count is incremented/decremented in places other than fget/fput, like fget_light/fput_light and get_file, the current task must already hold a file refcnt. The call to __fput() is delayed until the refcnt becomes 0, resulting in ima_file_free() flagging any changes. - add hook to increment opencount for IPC shared memory(SYSV), shmat files, and /dev/zero - moved NULL iint test in opencount_get() Signed-off-by: Mimi Zohar <zohar@us.ibm.com> Acked-by: Serge Hallyn <serue@us.ibm.com> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'mm/shmem.c')
-rw-r--r--mm/shmem.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/shmem.c b/mm/shmem.c
index f1b0d4871f3..dd5588f5d93 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -51,6 +51,7 @@
51#include <linux/highmem.h> 51#include <linux/highmem.h>
52#include <linux/seq_file.h> 52#include <linux/seq_file.h>
53#include <linux/magic.h> 53#include <linux/magic.h>
54#include <linux/ima.h>
54 55
55#include <asm/uaccess.h> 56#include <asm/uaccess.h>
56#include <asm/div64.h> 57#include <asm/div64.h>
@@ -2600,6 +2601,7 @@ int shmem_zero_setup(struct vm_area_struct *vma)
2600 if (IS_ERR(file)) 2601 if (IS_ERR(file))
2601 return PTR_ERR(file); 2602 return PTR_ERR(file);
2602 2603
2604 ima_shm_check(file);
2603 if (vma->vm_file) 2605 if (vma->vm_file)
2604 fput(vma->vm_file); 2606 fput(vma->vm_file);
2605 vma->vm_file = file; 2607 vma->vm_file = file;