lkml.org 
[lkml]   [2017]   [Oct]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 11/18] ima: Export func_tokens
    Date
    ima_read_modsig will need it so that it can show an error message.

    Signed-off-by: Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>
    ---
    security/integrity/ima/ima.h | 2 ++
    security/integrity/ima/ima_policy.c | 12 ++++++------
    2 files changed, 8 insertions(+), 6 deletions(-)

    diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
    index 4e61d3189b72..c9ba4362760b 100644
    --- a/security/integrity/ima/ima.h
    +++ b/security/integrity/ima/ima.h
    @@ -195,6 +195,8 @@ enum ima_hooks {
    __ima_hooks(__ima_hook_enumify)
    };

    +extern const char *const func_tokens[];
    +
    /* LIM API function definitions */
    int ima_get_action(struct inode *inode, int mask,
    enum ima_hooks func, int *pcr);
    diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
    index efd8e1c60c10..7355d4ab7bf4 100644
    --- a/security/integrity/ima/ima_policy.c
    +++ b/security/integrity/ima/ima_policy.c
    @@ -959,6 +959,12 @@ void ima_delete_rules(void)
    }
    }

    +#define __ima_hook_stringify(str) (#str),
    +
    +const char *const func_tokens[] = {
    + __ima_hooks(__ima_hook_stringify)
    +};
    +
    #ifdef CONFIG_IMA_READ_POLICY
    enum {
    mask_exec = 0, mask_write, mask_read, mask_append
    @@ -971,12 +977,6 @@ static const char *const mask_tokens[] = {
    "MAY_APPEND"
    };

    -#define __ima_hook_stringify(str) (#str),
    -
    -static const char *const func_tokens[] = {
    - __ima_hooks(__ima_hook_stringify)
    -};
    -
    void *ima_policy_start(struct seq_file *m, loff_t *pos)
    {
    loff_t l = *pos;
    \
     
     \ /
      Last update: 2017-10-22 17:06    [W:5.319 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site