IMA: making i_readcount a first class inode citizen
Subsystems (4)
cover IMA: making i_readcount a first class inode citizen
Based on the previous posting discussion, i_readcount is now defined as atomic.
This patchset separates the incrementing/decrementing of the i_readcount, in the VFS layer, from other IMA functionality, by replacing the current ima_counts_get() call with iget_readcount(). Its unclear whether this call to increment i_readcount should be made earlier, like i_writecount.
The patch ordering is a bit redundant in order to leave removing the ifdef around i_readcount until the last patch. The first four patches: redefines i_readcount as atomic, defines iget/iput_readcount(), moves the IMA functionality in ima_counts_get() to ima_file_check(), and removes the IMA imbalance code, simplifying IMA. The last patch moves iput_readcount() to the fs directory and removes the ifdef around i_readcount, making i_readcount into a "first class inode citizen".
The generic_setlease code could then take advantage of i_readcount.
Mimi
Mimi Zohar (5):
IMA: convert i_readcount to atomic
IMA: define readcount functions
IMA: maintain i_readcount in the VFS layer
IMA: remove IMA imbalance checking
IMA: making i_readcount a first class inode citizen
fs/file_table.c | 16 ++++- fs/inode.c | 3 + fs/open.c | 3 +- include/linux/fs.h | 9 ++- include/linux/ima.h | 6 -- security/integrity/ima/ima_iint.c | 5 -- security/integrity/ima/ima_main.c | 131 +++++-------------------------------- 7 files changed, 43 insertions(+), 130 deletions(-)
Signature · 1 line
1.7.2.2
PATCH 1/5 IMA: convert i_readcount to atomic
Convert the inode's i_readcount from an unsigned int to atomic.
--- include/linux/fs.h | 2 +- security/integrity/ima/ima_iint.c | 7 ++++--- security/integrity/ima/ima_main.c | 11 ++++++----- 3 files changed, 11 insertions(+), 9 deletions(-)
include/linux/fs.h +1 -1
@@ -788,7 +788,7 @@ struct inode {#ifdef CONFIG_IMA /* protected by i_lock */ -unsigned int i_readcount;/* struct files open RO */ +atomic_t i_readcount;/* struct files open RO */ #endif atomic_t i_writecount;#ifdef CONFIG_SECURITY
security/integrity/ima/ima_iint.c +4 -3
@@ -137,10 +137,11 @@ void ima_inode_free(struct inode *inode) {struct ima_iint_cache *iint; -if (inode->i_readcount) -printk (KERN_INFO "%s: readcount: %u\n" , __func__, inode->i_readcount); +if (atomic_read (&inode->i_readcount)) +printk (KERN_INFO "%s: readcount: %u\n" , __func__, +atomic_read (&inode->i_readcount)); - inode->i_readcount =0 ; +atomic_set (&inode->i_readcount,0 );if (!IS_IMA (inode))return ;
security/integrity/ima/ima_main.c +6 -5
@@ -113,7 +113,7 @@ void ima_counts_get(struct file *file) goto out;if (mode &FMODE_WRITE ) { -if (inode->i_readcount &&IS_IMA (inode)) +if (atomic_read (&inode->i_readcount) &&IS_IMA (inode)) send_tomtou = true; goto out; }
@@ -127,7 +127,7 @@ void ima_counts_get(struct file *file) out:/* remember the vfs deals with i_writecount */ if ((mode & (FMODE_READ |FMODE_WRITE )) ==FMODE_READ ) - inode->i_readcount++; +atomic_inc (&inode->i_readcount);spin_unlock (&inode->i_lock);
@@ -149,15 +149,16 @@ static void ima_dec_counts(struct inode *inode, struct file *file)assert_spin_locked (&inode->i_lock);if ((mode & (FMODE_READ |FMODE_WRITE )) ==FMODE_READ ) { -if (unlikely (inode->i_readcount ==0 )) { +if (unlikely (atomic_read (&inode->i_readcount) ==0 )) {if (!ima_limit_imbalance (file)) {printk (KERN_INFO "%s: open/free imbalance (r:%u)\n" , - __func__, inode->i_readcount); + __func__, +atomic_read (&inode->i_readcount));dump_stack (); }return ; } - inode->i_readcount--; +atomic_dec (&inode->i_readcount); } }
Signature · 1 line
1.7.2.2
PATCH 2/5 IMA: define readcount functions
In reply to Mimi ZoharDefine iget/iput_readcount() functions to be called from the VFS layer.
--- include/linux/fs.h | 16 ++++++++++++++++ security/integrity/ima/Makefile | 2 +- security/integrity/ima/ima_readcount.c | 25 +++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletions(-) create mode 100644 security/integrity/ima/ima_readcount.c
include/linux/fs.h +16 -0
@@ -2178,6 +2178,22 @@ static inline void allow_write_access(struct file *file)if (file)atomic_inc (&file->f_path.dentry->d_inode->i_writecount); } +#ifdef CONFIG_IMA +extern void iput_readcount (struct inode *inode); +static inline void iget_readcount (struct inode *inode) +{ +atomic_inc (&inode->i_readcount); +} +#else +static inline void iput_readcount (struct inode *inode) +{ +return ; +} +static inline void iget_readcount (struct inode *inode) +{ +return ; +} +#endif extern int do_pipe_flags (int *,int );extern struct file *create_read_pipe (struct file *f,int flags);extern struct file *create_write_pipe (int flags);
security/integrity/ima/Makefile +1 -1
@@ -6,4 +6,4 @@ obj-$(CONFIG_IMA) += ima.o ima-y := ima_fs.o ima_queue.o ima_init.o ima_main.o ima_crypto.o ima_api.o \ - ima_policy.o ima_iint.o ima_audit.o + ima_policy.o ima_iint.o ima_audit.o ima_readcount.o
security/integrity/ima/ima_readcount.c new file +25 -0
@@ -0,0 +1,25 @@ +/* +* Copyright (C) 2010 IBM Corporation +* +* Authors: +* Mimi Zohar <[email protected]> +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation, version 2 of the +* License. +*/ +#include <linux/module.h> +#include <linux/spinlock.h> +#include <linux/fs.h> + +void iput_readcount (struct inode *inode) +{ +spin_lock (&inode->i_lock); +if (unlikely ((atomic_read (&inode->i_readcount) ==0 ))) +printk (KERN_INFO "i_readcount: imbalance ino %ld\n" , + inode->i_ino); +else +atomic_dec (&inode->i_readcount); +spin_unlock (&inode->i_lock); +}
Signature · 1 line
1.7.2.2
Re: [PATCH v1.1 2/5] IMA: define readcount functions
Quoted 1 line · Mimi Zohar
Define iget/iput_readcount() functions to be called from the VFS layer.
Can't say I like the function names. i_readcount_{inc,dec} seem more appropriate, especially so they don't get confused with inode reference counting...
Cheers,
Dave.
security/integrity/ima/ima_readcount.c line 25
Quoted 10 lines
security/integrity/ima/ima_readcount.c new file +10
-0+void iput_readcount (struct inode *inode) +{ +spin_lock (&inode->i_lock); +if (unlikely ((atomic_read (&inode->i_readcount) ==0 ))) +printk (KERN_INFO "i_readcount: imbalance ino %ld\n" , + inode->i_ino); +else +atomic_dec (&inode->i_readcount); +spin_unlock (&inode->i_lock); +}
No need for the lock just to indicate an imbalance. You could just use:
if (atomic_dec_return(&inode->i_readcount) < 0) {
.....
}Given this is an integrity subsystem, I suspect the correct thing to do here is BUG(), not just issue an informational message that something is wrong with the integrity tracking....
Cheers,
Dave.
Signature · 2 lines
Dave Chinner [email protected]
Re: [PATCH v1.1 2/5] IMA: define readcount functions
Quoted 10 lines · Dave Chinner
Quoted 1 line · Mimi Zohar
Define iget/iput_readcount() functions to be called from the VFS layer.
Can't say I like the function names. i_readcount_{inc,dec} seem more appropriate, especially so they don't get confused with inode reference counting...
Cheers,
Dave.
Definitely better naming. thanks!
Quoted 18 lines
security/integrity/ima/ima_readcount.c line 25
Quoted 10 lines
security/integrity/ima/ima_readcount.c new file +10
-0+void iput_readcount (struct inode *inode) +{ +spin_lock (&inode->i_lock); +if (unlikely ((atomic_read (&inode->i_readcount) ==0 ))) +printk (KERN_INFO "i_readcount: imbalance ino %ld\n" , + inode->i_ino); +else +atomic_dec (&inode->i_readcount); +spin_unlock (&inode->i_lock); +}No need for the lock just to indicate an imbalance. You could just use:
if (atomic_dec_return(&inode->i_readcount) < 0) { ..... }
Quoted 7 lines
Given this is an integrity subsystem, I suspect the correct thing to do here is
BUG(), not just issue an informational message that something is wrong with the integrity tracking....Cheers,
Dave.
Yes, as Eric explained, the testing is a remnant from IMA, when it wasn't fully integrated in the kernel.
thanks,
Mimi
PATCH 3/5 IMA: maintain i_readcount in the VFS layer
In reply to Mimi Zoharima_counts_get() updated the readcount and invalidated the PCR, as necessary. Only update the i_readcount in the VFS layer. Move the PCR invalidation checks to ima_file_check(), where it belongs.
Maintaining the i_readcount in the VFS layer, will allow other subsystems to use i_readcount.
--- fs/file_table.c | 5 ++++- fs/inode.c | 3 +++ fs/open.c | 3 ++- include/linux/ima.h | 6 ------ security/integrity/ima/ima_iint.c | 2 -- security/integrity/ima/ima_main.c | 25 ++++++++----------------- 6 files changed, 17 insertions(+), 27 deletions(-)
fs/file_table.c +4 -1
@@ -190,7 +190,8 @@ struct file *alloc_file(struct path *path, fmode_t mode,file_take_write (file);WARN_ON (mnt_clone_write (path->mnt)); } -ima_counts_get (file); +if ((mode & (FMODE_READ |FMODE_WRITE )) ==FMODE_READ ) +iget_readcount (path->dentry->d_inode);return file; }EXPORT_SYMBOL (alloc_file);
@@ -251,6 +252,8 @@ static void __fput(struct file *file)fops_put (file->f_op);put_pid (file->f_owner.pid);file_sb_list_del (file); +if ((file->f_mode & (FMODE_READ |FMODE_WRITE )) ==FMODE_READ ) +iput_readcount (inode);if (file->f_mode &FMODE_WRITE )drop_file_write_access (file); file->f_path.dentry =NULL ;
fs/inode.c +3 -0
@@ -170,6 +170,9 @@ int inode_init_always(struct super_block *sb, struct inode *inode) inode->i_nlink =1 ; inode->i_uid =0 ; inode->i_gid =0 ; +#ifdef CONFIG_IMA +atomic_set (&inode->i_readcount,0 ); +#endif atomic_set (&inode->i_writecount,0 ); inode->i_size =0 ; inode->i_blocks =0 ;
fs/open.c +2 -1
@@ -688,7 +688,8 @@ static struct file *__dentry_open(struct dentry *dentry, struct vfsmount *mnt,if (error) goto cleanup_all; } -ima_counts_get (f); +if ((f->f_mode & (FMODE_READ |FMODE_WRITE )) ==FMODE_READ ) +iget_readcount (inode); f->f_flags &= ~(O_CREAT |O_EXCL |O_NOCTTY |O_TRUNC );
include/linux/ima.h +0 -6
@@ -20,7 +20,6 @@ extern void ima_inode_free(struct inode *inode);extern int ima_file_check (struct file *file,int mask);extern void ima_file_free (struct file *file);extern int ima_file_mmap (struct file *file,unsigned long prot); -extern void ima_counts_get (struct file *file);#else static inline int ima_bprm_check (struct linux_binprm *bprm)
@@ -53,10 +52,5 @@ static inline int ima_file_mmap(struct file *file, unsigned long prot)return 0 ; } -static inline void ima_counts_get (struct file *file) -{ -return ; -} -#endif /* CONFIG_IMA_H */ #endif /* _LINUX_IMA_H */
security/integrity/ima/ima_iint.c +0 -2
@@ -141,8 +141,6 @@ void ima_inode_free(struct inode *inode)printk (KERN_INFO "%s: readcount: %u\n" , __func__,atomic_read (&inode->i_readcount)); -atomic_set (&inode->i_readcount,0 ); -if (!IS_IMA (inode))return ;
security/integrity/ima/ima_main.c +8 -17
@@ -86,17 +86,16 @@ out: }/* -* ima_counts_get - increment file counts +* ima_rdwr_violation_check * -* Maintain read/write counters for all files, but only -* invalidate the PCR for measured files: +* Only invalidate the PCR for measured files: * - Opening a file for write when already open for read, * results in a time of measure, time of use (ToMToU) error. * - Opening a file for read when already open for write, * could result in a file measurement error. * */ -void ima_counts_get (struct file *file) +static void ima_rdwr_violation_check (struct file *file) {struct dentry *dentry = file->f_path.dentry;struct inode *inode = dentry->d_inode;
@@ -104,13 +103,10 @@ void ima_counts_get(struct file *file)int rc;bool send_tomtou = false, send_writers = false; -if (!S_ISREG (inode->i_mode)) +if (!S_ISREG (inode->i_mode) || !ima_initialized)return ; -spin_lock (&inode->i_lock); - -if (!ima_initialized) - goto out; +mutex_lock (&inode->i_mutex);/* file metadata: permissions, xattr */ if (mode &FMODE_WRITE ) {if (atomic_read (&inode->i_readcount) &&IS_IMA (inode))
@@ -125,11 +121,7 @@ void ima_counts_get(struct file *file)if (atomic_read (&inode->i_writecount) >0 ) send_writers = true; out: -/* remember the vfs deals with i_writecount */ -if ((mode & (FMODE_READ |FMODE_WRITE )) ==FMODE_READ ) -atomic_inc (&inode->i_readcount); - -spin_unlock (&inode->i_lock); +mutex_unlock (&inode->i_mutex);if (send_tomtou) ima_add_violation(inode, dentry->d_name.name, "invalid_pcr",
@@ -158,7 +150,6 @@ static void ima_dec_counts(struct inode *inode, struct file *file) }return ; } -atomic_dec (&inode->i_readcount); } }
@@ -203,8 +194,7 @@ static void ima_file_free_noiint(struct inode *inode, struct file *file)* ima_file_free - called on __fput() * @file: pointer to file structure being freed * -* Flag files that changed, based on i_version; -* and decrement the i_readcount. +* Flag files that changed, based on i_version */ void ima_file_free (struct file *file) {
@@ -318,6 +308,7 @@ int ima_file_check(struct file *file, int mask) {int rc; +ima_rdwr_violation_check (file); rc =process_measurement (file, file->f_dentry->d_name.name, mask & (MAY_READ |MAY_WRITE |MAY_EXEC ),FILE_CHECK );
Signature · 1 line
1.7.2.2
PATCH 4/5 IMA: remove IMA imbalance checking
In reply to Mimi ZoharNow that i_readcount is maintained by the VFS layer, remove the imbalance checking in IMA. Cleans up the IMA code nicely.
--- security/integrity/ima/ima_iint.c | 4 -- security/integrity/ima/ima_main.c | 105 +++---------------------------------- 2 files changed, 8 insertions(+), 101 deletions(-)
security/integrity/ima/ima_iint.c +0 -4
@@ -137,10 +137,6 @@ void ima_inode_free(struct inode *inode) {struct ima_iint_cache *iint; -if (atomic_read (&inode->i_readcount)) -printk (KERN_INFO "%s: readcount: %u\n" , __func__, -atomic_read (&inode->i_readcount)); -if (!IS_IMA (inode))return ;
security/integrity/ima/ima_main.c +8 -97
131 lines not on this page · raw message
Signature · 1 line
1.7.2.2
PATCH 5/5 IMA: making i_readcount a first class inode citizen
In reply to Mimi ZoharFinally, remove the ifdef's around i_readcount, making it a full inode citizen so that other subsystems, such as leases, could use it.
--- fs/file_table.c | 11 +++++++++++ include/linux/fs.h | 13 ------------- security/integrity/ima/Makefile | 2 +- security/integrity/ima/ima_readcount.c | 25 ------------------------- 4 files changed, 12 insertions(+), 39 deletions(-) delete mode 100644 security/integrity/ima/ima_readcount.c
fs/file_table.c +11 -0
@@ -92,6 +92,17 @@ int proc_nr_files(ctl_table *table, int write, }#endif +void iput_readcount (struct inode *inode) +{ +spin_lock (&inode->i_lock); +if (unlikely ((atomic_read (&inode->i_readcount) ==0 ))) +printk (KERN_INFO "i_readcount: imbalance ino %ld\n" , + inode->i_ino); +else +atomic_dec (&inode->i_readcount); +spin_unlock (&inode->i_lock); +} +/* Find an unused file structure and return a pointer to it. * Returns NULL, if there are no more free file structures or * we run out of memory.
include/linux/fs.h +0 -13
@@ -786,10 +786,8 @@ struct inode {unsigned int i_flags; -#ifdef CONFIG_IMA /* protected by i_lock */ atomic_t i_readcount;/* struct files open RO */ -#endif atomic_t i_writecount;#ifdef CONFIG_SECURITY void *i_security;
@@ -2178,22 +2176,11 @@ static inline void allow_write_access(struct file *file)if (file)atomic_inc (&file->f_path.dentry->d_inode->i_writecount); } -#ifdef CONFIG_IMA extern void iput_readcount (struct inode *inode);static inline void iget_readcount (struct inode *inode) {atomic_inc (&inode->i_readcount); } -#else -static inline void iput_readcount (struct inode *inode) -{ -return ; -} -static inline void iget_readcount (struct inode *inode) -{ -return ; -} -#endif extern int do_pipe_flags (int *,int );extern struct file *create_read_pipe (struct file *f,int flags);extern struct file *create_write_pipe (int flags);
security/integrity/ima/Makefile +1 -1
@@ -6,4 +6,4 @@ obj-$(CONFIG_IMA) += ima.o ima-y := ima_fs.o ima_queue.o ima_init.o ima_main.o ima_crypto.o ima_api.o \ - ima_policy.o ima_iint.o ima_audit.o ima_readcount.o + ima_policy.o ima_iint.o ima_audit.o
security/integrity/ima/ima_readcount.c deleted +0 -25
@@ -1,25 +0,0 @@ -/* -* Copyright (C) 2010 IBM Corporation -* -* Authors: -* Mimi Zohar <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License as -* published by the Free Software Foundation, version 2 of the -* License. -*/ -#include <linux/module.h> -#include <linux/spinlock.h> -#include <linux/fs.h> - -void iput_readcount (struct inode *inode) -{ -spin_lock (&inode->i_lock); -if (unlikely ((atomic_read (&inode->i_readcount) ==0 ))) -printk (KERN_INFO "i_readcount: imbalance ino %ld\n" , - inode->i_ino); -else -atomic_dec (&inode->i_readcount); -spin_unlock (&inode->i_lock); -}
Signature · 1 line
1.7.2.2
Quoted 16 lines · Mimi Zohar
Based on the previous posting discussion,
i_readcountis now defined as atomic.This patchset separates the incrementing/decrementing of the
i_readcount, in the VFS layer, from other IMA functionality, by replacing the currentima_counts_get()call withiget_readcount(). Its unclear whether this call to incrementi_readcountshould be made earlier, likei_writecount.The patch ordering is a bit redundant in order to leave removing the ifdef around
i_readcountuntil the last patch. The first four patches: redefinesi_readcountas atomic, defines iget/iput_readcount(), moves the IMA functionality inima_counts_get()toima_file_check(), and removes the IMA imbalance code, simplifying IMA. The last patch movesiput_readcount()to the fs directory and removes the ifdef aroundi_readcount, makingi_readcountinto a "first class inode citizen".
Quoted 1 line
The
generic_setleasecode could then take advantage ofi_readcount.
Hey Mimi,
couple of comment and questions, can you help me understand what you believe the three locks in question are currently protecting? And remember I already said I don't think they are quite right before you
started so try not to use that as your example :)
inode->i_lockinode->i_mutexiint->mutex
I also question you finishing in patch 5/5 with:
+void iput_readcount(struct inode *inode)
+{
+ spin_lock(&inode->i_lock);
+ if (unlikely((atomic_read(&inode->i_readcount) == 0)))
+ printk(KERN_INFO "i_readcount: imbalance ino %ld\n",
+ inode->i_ino);
+ else
+ atomic_dec(&inode->i_readcount);
+ spin_unlock(&inode->i_lock);
+}
obviously I wonder what the locking is for, but really I question why we need this as a conditional at all. If we are really worried it should be a WARN_ON() or BUG() but personally I wonder if we need it at all. The VFS is by supposed to get stuff right. All of the interesting checks around IMA were mostly needed because IMA was an object that hung off the side of the VFS and you couldn't be certain that all filesystems were adhering to the calling conventions you thought were correct. Since we've pretty much moved all of this into the VFS its about time we stop wasting time wondering if our assumptions are correct. These are pretty hot paths and I'm all for cutting down the IMA overhead on them. If we do that this function becomes:
BUG_ON(!atomic_read(&inode->i_readcount))atomic_dec(&inode->i_readcont);
it also means that we don't need to set the i_readcount to 0 in inode_init_always() from patch 3....
Quoted 19 lines · Eric Paris
Quoted 16 lines · Mimi Zohar
Based on the previous posting discussion,
i_readcountis now defined as atomic.This patchset separates the incrementing/decrementing of the
i_readcount, in the VFS layer, from other IMA functionality, by replacing the currentima_counts_get()call withiget_readcount(). Its unclear whether this call to incrementi_readcountshould be made earlier, likei_writecount.The patch ordering is a bit redundant in order to leave removing the ifdef around
i_readcountuntil the last patch. The first four patches: redefinesi_readcountas atomic, defines iget/iput_readcount(), moves the IMA functionality inima_counts_get()toima_file_check(), and removes the IMA imbalance code, simplifying IMA. The last patch movesiput_readcount()to the fs directory and removes the ifdef aroundi_readcount, makingi_readcountinto a "first class inode citizen".Quoted 1 line
The
generic_setleasecode could then take advantage ofi_readcount.
Quoted 8 lines
Hey Mimi,
couple of comment and questions, can you help me understand what you believe the three locks in question are currently protecting? And remember I already said I don't think they are quite right before you
started so try not to use that as your example :)
inode->i_lock
It shouldn't be necessary. As you originally said,
Quoted 6 lines
Quoted 4 lines
My thought was that the IMA read/write checks should happen AFTER the
i_writecountandi_readcountcounters were updated. Thus even if we raced with another task we can rest assured that the other task would catch the situation we missed....
inode->i_mutex
As the measurement policy is based on file metdata (eg, permissions, xattrs), the mutex is taken to prevent the file metadata from changing, while making the measurement decision.
Quoted 1 line
iint->mutex
Taken when accessing/modifying the iint structure.
Quoted 25 lines
I also question you finishing in patch 5/5 with:
(quoted diff) +10
-0+void iput_readcount(struct inode *inode) +{ + spin_lock(&inode->i_lock); + if (unlikely((atomic_read(&inode->i_readcount) == 0))) + printk(KERN_INFO "i_readcount: imbalance ino %ld\n", + inode->i_ino); + else + atomic_dec(&inode->i_readcount); + spin_unlock(&inode->i_lock); +}obviously I wonder what the locking is for, but really I question why we need this as a conditional at all. If we are really worried it should be a
WARN_ON()orBUG()but personally I wonder if we need it at all. The VFS is by supposed to get stuff right. All of the interesting checks around IMA were mostly needed because IMA was an object that hung off the side of the VFS and you couldn't be certain that all filesystems were adhering to the calling conventions you thought were correct. Since we've pretty much moved all of this into the VFS its about time we stop wasting time wondering if our assumptions are correct. These are pretty hot paths and I'm all for cutting down the IMA overhead on them. If we do that this function becomes:
Quoted 2 lines
BUG_ON(!atomic_read(&inode->i_readcount))
atomic_dec(&inode->i_readcont);
yes, nice.
Quoted 2 lines
it also means that we don't need to set the
i_readcountto 0 ininode_init_always()from patch 3....
True, and init_once() sets the inode structure to 0.
thanks,
Mimi