lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 9 Jan 2018 09:10:55 -0500 From: Jeff Layton <jlayton@...nel.org> To: linux-fsdevel@...r.kernel.org Cc: linux-kernel@...r.kernel.org, viro@...iv.linux.org.uk, linux-nfs@...r.kernel.org, bfields@...ldses.org, neilb@...e.de, jack@...e.de, linux-ext4@...r.kernel.org, tytso@....edu, adilger.kernel@...ger.ca, linux-xfs@...r.kernel.org, darrick.wong@...cle.com, david@...morbit.com, linux-btrfs@...r.kernel.org, clm@...com, jbacik@...com, dsterba@...e.com, linux-integrity@...r.kernel.org, zohar@...ux.vnet.ibm.com, dmitry.kasatkin@...il.com, linux-afs@...ts.infradead.org, dhowells@...hat.com, jaltman@...istor.com, krzk@...nel.org Subject: [PATCH v5 15/19] IMA: switch IMA over to new i_version API From: Jeff Layton <jlayton@...hat.com> Signed-off-by: Jeff Layton <jlayton@...hat.com> --- security/integrity/ima/ima_api.c | 3 ++- security/integrity/ima/ima_main.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c index c7e8db0ea4c0..c6ae42266270 100644 --- a/security/integrity/ima/ima_api.c +++ b/security/integrity/ima/ima_api.c @@ -18,6 +18,7 @@ #include <linux/fs.h> #include <linux/xattr.h> #include <linux/evm.h> +#include <linux/iversion.h> #include "ima.h" @@ -215,7 +216,7 @@ int ima_collect_measurement(struct integrity_iint_cache *iint, * which do not support i_version, support is limited to an initial * measurement/appraisal/audit. */ - i_version = file_inode(file)->i_version; + i_version = inode_query_iversion(inode); hash.hdr.algo = algo; /* Initialize hash digest to 0's in case of failure */ diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c index 50b82599994d..06a70c5a2329 100644 --- a/security/integrity/ima/ima_main.c +++ b/security/integrity/ima/ima_main.c @@ -24,6 +24,7 @@ #include <linux/slab.h> #include <linux/xattr.h> #include <linux/ima.h> +#include <linux/iversion.h> #include "ima.h" @@ -128,7 +129,7 @@ static void ima_check_last_writer(struct integrity_iint_cache *iint, inode_lock(inode); if (atomic_read(&inode->i_writecount) == 1) { if (!IS_I_VERSION(inode) || - (iint->version != inode->i_version) || + inode_cmp_iversion(inode, iint->version) || (iint->flags & IMA_NEW_FILE)) { iint->flags &= ~(IMA_DONE_MASK | IMA_NEW_FILE); iint->measured_pcrs = 0; -- 2.14.3
Powered by blists - more mailing lists