lkml.org 
[lkml]   [2011]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 19/21] evm: replace hmac_status with evm_status
    Date
    From: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>

    We will use digital signatures in addtion to hmac.

    Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
    Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
    ---
    security/integrity/evm/evm_main.c | 14 +++++++-------
    security/integrity/iint.c | 2 +-
    security/integrity/integrity.h | 2 +-
    3 files changed, 9 insertions(+), 9 deletions(-)

    diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c
    index 245ef23..3afefff 100644
    --- a/security/integrity/evm/evm_main.c
    +++ b/security/integrity/evm/evm_main.c
    @@ -57,8 +57,8 @@ static enum integrity_status evm_verify_hmac(struct dentry *dentry,
    char hmac_val[MAX_DIGEST_SIZE + 1];
    int rc;

    - if (iint->hmac_status == INTEGRITY_PASS)
    - return iint->hmac_status;
    + if (iint->evm_status == INTEGRITY_PASS)
    + return iint->evm_status;

    /* if status is not PASS, try to check again - against -ENOMEM */

    @@ -73,18 +73,18 @@ static enum integrity_status evm_verify_hmac(struct dentry *dentry,
    GFP_NOFS);
    if (rc < 0)
    goto err_out;
    - iint->hmac_status = INTEGRITY_PASS;
    - return iint->hmac_status;
    + iint->evm_status = INTEGRITY_PASS;
    + return iint->evm_status;

    err_out:
    switch (rc) {
    case -ENODATA: /* file not labelled */
    - iint->hmac_status = INTEGRITY_NOLABEL;
    + iint->evm_status = INTEGRITY_NOLABEL;
    break;
    default:
    - iint->hmac_status = INTEGRITY_FAIL;
    + iint->evm_status = INTEGRITY_FAIL;
    }
    - return iint->hmac_status;
    + return iint->evm_status;
    }

    static int evm_protected_xattr(const char *req_xattr_name)
    diff --git a/security/integrity/iint.c b/security/integrity/iint.c
    index 991df20..0a23e07 100644
    --- a/security/integrity/iint.c
    +++ b/security/integrity/iint.c
    @@ -157,7 +157,7 @@ static void init_once(void *foo)
    iint->version = 0;
    iint->flags = 0UL;
    mutex_init(&iint->mutex);
    - iint->hmac_status = INTEGRITY_UNKNOWN;
    + iint->evm_status = INTEGRITY_UNKNOWN;
    }

    static int __init integrity_iintcache_init(void)
    diff --git a/security/integrity/integrity.h b/security/integrity/integrity.h
    index 2232cd1..eb2c639 100644
    --- a/security/integrity/integrity.h
    +++ b/security/integrity/integrity.h
    @@ -28,7 +28,7 @@ struct integrity_iint_cache {
    unsigned char flags;
    u8 digest[MAX_DIGEST_SIZE];
    struct mutex mutex; /* protects: version, flags, digest */
    - enum integrity_status hmac_status;
    + enum integrity_status evm_status;
    };

    /* rbtree tree calls to lookup, insert, delete
    --
    1.7.3.4


    \
     
     \ /
      Last update: 2011-05-16 16:51    [W:0.051 / U:0.828 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site