IMA: switch IMA over to new i_version API
Signed-off-by: Jeff Layton <jlayton@redhat.com>
This commit is contained in:
parent
f0e2828062
commit
3b370b215f
|
@ -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 */
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue