]> git.neil.brown.name Git - history.git/commitdiff
CacheFiles: Update IMA counters when using dentry_open
authorMarc Dionne <marc.c.dionne@gmail.com>
Tue, 1 Dec 2009 14:09:24 +0000 (14:09 +0000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Dec 2009 15:35:11 +0000 (07:35 -0800)
When IMA is active, using dentry_open without updating the
IMA counters will result in free/open imbalance errors when
fput is eventually called.

Signed-off-by: Marc Dionne <marc.c.dionne@gmail.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/cachefiles/rdwr.c

index 1d8332563863ce5d858971a68f4a7463c72385c2..a6c8c6fe8df9ca5d54625a07496c8b2b42dd771f 100644 (file)
@@ -11,6 +11,7 @@
 
 #include <linux/mount.h>
 #include <linux/file.h>
+#include <linux/ima.h>
 #include "internal.h"
 
 /*
@@ -922,6 +923,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
        if (IS_ERR(file)) {
                ret = PTR_ERR(file);
        } else {
+               ima_counts_get(file);
                ret = -EIO;
                if (file->f_op->write) {
                        pos = (loff_t) page->index << PAGE_SHIFT;