lkml.org 
[lkml]   [2011]   [Aug]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/2] evm: fix evm_inode_init_security return code
    Date
    evm_inode_init_security() should return 0, when EVM is not enabled.
    (Returning an error is a remnant of evm_inode_post_init_security.)

    Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
    ---
    include/linux/evm.h | 2 +-
    security/integrity/evm/evm_main.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/include/linux/evm.h b/include/linux/evm.h
    index 62deb65..ea603c9 100644
    --- a/include/linux/evm.h
    +++ b/include/linux/evm.h
    @@ -85,7 +85,7 @@ static inline int evm_inode_init_security(struct inode *inode,
    const struct xattr *xattr_array,
    struct xattr *evm)
    {
    - return -EOPNOTSUPP;
    + return 0;
    }

    #endif /* CONFIG_EVM_H */
    diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c
    index 8fc5b5d..f0127e5 100644
    --- a/security/integrity/evm/evm_main.c
    +++ b/security/integrity/evm/evm_main.c
    @@ -324,7 +324,7 @@ int evm_inode_init_security(struct inode *inode,
    int rc;

    if (!evm_initialized || !evm_protected_xattr(lsm_xattr->name))
    - return -EOPNOTSUPP;
    + return 0;

    xattr_data = kzalloc(sizeof(*xattr_data), GFP_NOFS);
    if (!xattr_data)
    --
    1.7.3.4


    \
     
     \ /
      Last update: 2011-08-11 06:25    [W:0.035 / U:0.324 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site