ima: Defer query for iversion until it is needed
Subsystems (4)
PATCH 1/1 ima: Defer query for iversion until it is needed
Defer the query for the iversion until it is needed.
Signed-off-by Stefan Berger <[email protected]>
--- security/integrity/ima/ima_api.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
security/integrity/ima/ima_api.c +1 -3
@@ -248,7 +248,6 @@ int ima_collect_measurement(struct integrity_iint_cache *iint,int result =0 ;int length;void *tmpbuf; -u64 i_version;/* * Always collect the modsig, because IMA might have already collected
@@ -267,7 +266,6 @@ int ima_collect_measurement(struct integrity_iint_cache *iint,* to an initial measurement/appraisal/audit, but was modified to * assume the file changed. */ - i_version =inode_query_iversion (inode); hash.hdr.algo = algo; hash.hdr.length = hash_digest_size[algo];
@@ -304,7 +302,7 @@ int ima_collect_measurement(struct integrity_iint_cache *iint, iint->ima_hash = tmpbuf;memcpy (iint->ima_hash, &hash, length); - iint->version = i_version; + iint->version =inode_query_iversion (inode);/* Possibly temporary failure due to type of read (eg. O_DIRECT) */ if (!result)
Signature · 1 line
2.36.1
Mimi Zohar
maintainerHi Stefan,
Quoted 28 lines · Stefan Berger
Defer the query for the iversion until it is needed.
Signed-off-by Stefan Berger <[email protected]>--- security/integrity/ima/ima_api.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)security/integrity/ima/ima_api.c +0
-2@@ -248,7 +248,6 @@ int ima_collect_measurement(struct integrity_iint_cache *iint,int result =0 ;int length;void *tmpbuf; -u64 i_version;/* * Always collect the modsig, because IMA might have already collected @@ -267,7 +266,6 @@ int ima_collect_measurement(struct integrity_iint_cache *iint,* to an initial measurement/appraisal/audit, but was modified to * assume the file changed. */ - i_version =inode_query_iversion (inode); hash.hdr.algo = algo; hash.hdr.length = hash_digest_size[algo];
security/integrity/ima/ima_api.c int ima_collect_measurement(struct integrity_iint_cache *iint, · line 308
Quoted 8 lines
security/integrity/ima/ima_api.c +1
-1@@ -304,7 +302,7 @@ int ima_collect_measurement(struct integrity_iint_cache *iint, iint->ima_hash = tmpbuf;memcpy (iint->ima_hash, &hash, length); - iint->version = i_version; + iint->version =inode_query_iversion (inode);/* Possibly temporary failure due to type of read (eg. O_DIRECT) */ if (!result)
Using the i_version value before calculating the file hash was done intentionally in case the file changed.
thanks,
Mimi