summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-02-07 14:25:22 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-02-07 14:25:22 -0800
commit6fbac201f95c03e4dbbd207caddaea8a00a78526 (patch)
treef13d00e4cc6da481de74063c44cb53387c8cc0e8 /security
parentfe803f862804065af4f856764cd85cafa01fe794 (diff)
parentc472c07bfed9c87d7e0b2c052d7e77fedd7109a9 (diff)
downloadlinux-stable-6fbac201f95c03e4dbbd207caddaea8a00a78526.tar.gz
linux-stable-6fbac201f95c03e4dbbd207caddaea8a00a78526.tar.bz2
linux-stable-6fbac201f95c03e4dbbd207caddaea8a00a78526.zip
Merge tag 'iversion-v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux
Pull inode->i_version cleanup from Jeff Layton: "Goffredo went ahead and sent a patch to rename this function, and reverse its sense, as we discussed last week. The patch is very straightforward and I figure it's probably best to go ahead and merge this to get the API as settled as possible" * tag 'iversion-v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux: iversion: Rename make inode_cmp_iversion{+raw} to inode_eq_iversion{+raw}
Diffstat (limited to 'security')
-rw-r--r--security/integrity/ima/ima_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index 061425dd6400..2cfb0c714967 100644
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -135,7 +135,7 @@ static void ima_check_last_writer(struct integrity_iint_cache *iint,
update = test_and_clear_bit(IMA_UPDATE_XATTR,
&iint->atomic_flags);
if (!IS_I_VERSION(inode) ||
- inode_cmp_iversion(inode, iint->version) ||
+ !inode_eq_iversion(inode, iint->version) ||
(iint->flags & IMA_NEW_FILE)) {
iint->flags &= ~(IMA_DONE_MASK | IMA_NEW_FILE);
iint->measured_pcrs = 0;