lkml.org 
[lkml]   [2017]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 15/19] IMA: switch IMA over to new i_version API
    Date
    From: Jeff Layton <jlayton@redhat.com>

    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    ---
    security/integrity/ima/ima_api.c | 2 +-
    security/integrity/ima/ima_main.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c
    index c7e8db0ea4c0..588d4c05eb1e 100644
    --- a/security/integrity/ima/ima_api.c
    +++ b/security/integrity/ima/ima_api.c
    @@ -215,7 +215,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..2ba3a12ff33c 100644
    --- a/security/integrity/ima/ima_main.c
    +++ b/security/integrity/ima/ima_main.c
    @@ -128,7 +128,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
    \
     
     \ /
      Last update: 2017-12-13 15:22    [W:4.101 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site