IMA: making i_readcount a first class inode citizen
Subsystems (4)
cover IMA: making i_readcount a first class inode citizen
Changelog:
- renamed iget/iput_readcount to i_readcount_inc/dec (Dave Chinner's suggestion)
- finished cleaning up the locking, so that: (based on Eric's comment.)
- i_lock is not required
- i_mutex is taken when making measurement decisions to prevent file metadata(eg. permissions, xattr) changing from under it.
- iint->mutex is taken when accessing/modifying the iint structure.
- 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 i_readcount_inc(). 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 i_readcount_inc/dec(), moves the IMA functionality in ima_counts_get() to ima_file_check(), and removes the IMA imbalance code, simplifying IMA. The last patch 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 | 5 +- fs/open.c | 3 +- include/linux/fs.h | 16 ++++- include/linux/ima.h | 6 -- security/integrity/ima/ima_iint.c | 5 -- security/integrity/ima/ima_main.c | 130 ++++--------------------------------- 6 files changed, 31 insertions(+), 134 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 | 3 +-- security/integrity/ima/ima_iint.c | 7 ++++--- security/integrity/ima/ima_main.c | 11 ++++++----- 3 files changed, 11 insertions(+), 10 deletions(-)
include/linux/fs.h +1 -2
@@ -787,8 +787,7 @@ struct inode {unsigned int i_flags;#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 i_readcount_inc/dec() functions to be called from the VFS layer.
Changelog:
- renamed iget/iput_readcount to i_readcount_inc/dec (Dave Chinner's suggestion)
- removed i_lock in iput_readcount() (based on comments:Dave Chinner,Eric Paris)
--- include/linux/fs.h | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-)
include/linux/fs.h +20 -0
@@ -2176,6 +2176,26 @@ static inline void allow_write_access(struct file *file)if (file)atomic_inc (&file->f_path.dentry->d_inode->i_writecount); } +#ifdef CONFIG_IMA +static inline void i_readcount_dec (struct inode *inode) +{ +BUG_ON (!atomic_read (&inode->i_readcount)); +atomic_dec (&inode->i_readcount); +} +static inline void i_readcount_inc (struct inode *inode) +{ +atomic_inc (&inode->i_readcount); +} +#else +static inline void i_readcount_dec (struct inode *inode) +{ +return ; +} +static inline void i_readcount_inc (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);
Signature · 1 line
1.7.2.2
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/open.c | 3 ++- include/linux/ima.h | 6 ------ security/integrity/ima/ima_iint.c | 2 -- security/integrity/ima/ima_main.c | 25 ++++++++----------------- 5 files changed, 14 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 ) +i_readcount_inc (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 ) +i_readcount_dec (inode);if (file->f_mode &FMODE_WRITE )drop_file_write_access (file); file->f_path.dentry =NULL ;
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 ) +i_readcount_inc (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 | 104 ++----------------------------------- 2 files changed, 4 insertions(+), 104 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 +4 -100
136 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.
--- include/linux/fs.h | 15 ++------------- 1 files changed, 2 insertions(+), 13 deletions(-)
include/linux/fs.h +2 -13
@@ -786,9 +786,7 @@ struct inode {unsigned int i_flags; -#ifdef CONFIG_IMA atomic_t i_readcount;/* struct files open RO */ -#endif atomic_t i_writecount;#ifdef CONFIG_SECURITY void *i_security;
@@ -2176,7 +2174,7 @@ static inline void allow_write_access(struct file *file)if (file)atomic_inc (&file->f_path.dentry->d_inode->i_writecount); } -#ifdef CONFIG_IMA +static inline void i_readcount_dec (struct inode *inode) {BUG_ON (!atomic_read (&inode->i_readcount));
@@ -2186,16 +2184,7 @@ static inline void i_readcount_inc(struct inode *inode) {atomic_inc (&inode->i_readcount); } -#else -static inline void i_readcount_dec (struct inode *inode) -{ -return ; -} -static inline void i_readcount_inc (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);
Signature · 1 line
1.7.2.2
Quoted 24 lines · Mimi Zohar
Changelog:
- renamed iget/iput_readcount to i_readcount_inc/dec (Dave Chinner's suggestion)
- finished cleaning up the locking, so that: (based on Eric's comment.)
-i_lockis not required
-i_mutexis taken when making measurement decisions to prevent file metadata(eg. permissions, xattr) changing from under it.
-iint->mutexis taken when accessing/modifying the iint structure.
- 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 withi_readcount_inc(). 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 i_readcount_inc/dec(), moves the IMA functionality inima_counts_get()toima_file_check(), and removes the IMA imbalance code, simplifying IMA. The last patch removes the ifdef aroundi_readcount, makingi_readcountinto a "first class inode citizen".The
generic_setleasecode could then take advantage ofi_readcount.
Quoted 7 lines
Mimi
Mimi Zohar (5):
IMA: converti_readcountto atomic
IMA: define readcount functions
IMA: maintaini_readcountin the VFS layer
IMA: remove IMA imbalance checking
IMA: makingi_readcounta first class inode citizen
Ack on patches 1-4. Patch 5 I'm not so sure about. As long as IMA is the only user I don't think we really want to unconditionally compile i_readcount in. I say we either leave it wrapped in CONFIG_IMA until there is a second user. Then we either unconditionally compile it in, or we wrap it in something that either user can select in the Kconfig.
I'll let others voice their opinion.
-Eric
Quoted 34 lines · Eric Paris
Quoted 24 lines · Mimi Zohar
Changelog:
- renamed iget/iput_readcount to i_readcount_inc/dec (Dave Chinner's suggestion)
- finished cleaning up the locking, so that: (based on Eric's comment.)
-i_lockis not required
-i_mutexis taken when making measurement decisions to prevent file metadata(eg. permissions, xattr) changing from under it.
-iint->mutexis taken when accessing/modifying the iint structure.
- 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 withi_readcount_inc(). 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 i_readcount_inc/dec(), moves the IMA functionality inima_counts_get()toima_file_check(), and removes the IMA imbalance code, simplifying IMA. The last patch removes the ifdef aroundi_readcount, makingi_readcountinto a "first class inode citizen".The
generic_setleasecode could then take advantage ofi_readcount.Quoted 7 lines
Mimi
Mimi Zohar (5):
IMA: converti_readcountto atomic
IMA: define readcount functions
IMA: maintaini_readcountin the VFS layer
IMA: remove IMA imbalance checking
IMA: makingi_readcounta first class inode citizen
Quoted 7 lines
Ack on patches 1-4. Patch 5 I'm not so sure about. As long as IMA is the only user I don't think we really want to unconditionally compile
i_readcountin. I say we either leave it wrapped inCONFIG_IMAuntil there is a second user. Then we either unconditionally compile it in, or we wrap it in something that either user can select in theKconfig.I'll let others voice their opinion.
I think it solves a real problem for the lease code.
--b.