diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-12-11 06:35:20 -0500 |
|---|---|---|
| committer | Jeff Layton <jlayton@redhat.com> | 2017-12-13 07:23:02 -0500 |
| commit | ac0bf025d2c0e88097f0ab247e7460053fef7e9d (patch) | |
| tree | 62295db61ea3697a038a552d92d029d2a616f66d /security/integrity | |
| parent | 50c4c4e268a2d7a3e58ebb698ac74da0de40ae36 (diff) | |
| download | linux-stable-ac0bf025d2c0e88097f0ab247e7460053fef7e9d.tar.gz linux-stable-ac0bf025d2c0e88097f0ab247e7460053fef7e9d.tar.bz2 linux-stable-ac0bf025d2c0e88097f0ab247e7460053fef7e9d.zip | |
ima: Use i_version only when filesystem supports it
i_version is only supported by a filesystem when the SB_I_VERSION
flag is set. This patch tests for the SB_I_VERSION flag before using
i_version. If we can't use i_version to detect a file change then we
must assume the file has changed in the last_writer path and remeasure
it.
On filesystems without i_version support IMA used to measure a file
only once and didn't detect any changes to a file. With this patch
IMA now works properly on these filesystems.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Diffstat (limited to 'security/integrity')
| -rw-r--r-- | security/integrity/ima/ima_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c index 770654694efc..50b82599994d 100644 --- a/security/integrity/ima/ima_main.c +++ b/security/integrity/ima/ima_main.c @@ -127,7 +127,8 @@ static void ima_check_last_writer(struct integrity_iint_cache *iint, inode_lock(inode); if (atomic_read(&inode->i_writecount) == 1) { - if ((iint->version != inode->i_version) || + if (!IS_I_VERSION(inode) || + (iint->version != inode->i_version) || (iint->flags & IMA_NEW_FILE)) { iint->flags &= ~(IMA_DONE_MASK | IMA_NEW_FILE); iint->measured_pcrs = 0; |