lkml.org 
[lkml]   [2020]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 194/261] ima: Set again build_ima_appraise variable
    Date
    From: Krzysztof Struczynski <krzysztof.struczynski@huawei.com>

    [ Upstream commit b59fda449cf07f2db3be3a67142e6c000f5e8d79 ]

    After adding the new add_rule() function in commit c52657d93b05
    ("ima: refactor ima_init_policy()"), all appraisal flags are added to the
    temp_ima_appraise variable. Revert to the previous behavior instead of
    removing build_ima_appraise, to benefit from the protection offered by
    __ro_after_init.

    The mentioned commit introduced a bug, as it makes all the flags
    modifiable, while build_ima_appraise flags can be protected with
    __ro_after_init.

    Cc: stable@vger.kernel.org # 5.0.x
    Fixes: c52657d93b05 ("ima: refactor ima_init_policy()")
    Co-developed-by: Roberto Sassu <roberto.sassu@huawei.com>
    Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
    Signed-off-by: Krzysztof Struczynski <krzysztof.struczynski@huawei.com>
    Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    security/integrity/ima/ima_policy.c | 10 ++++++++--
    1 file changed, 8 insertions(+), 2 deletions(-)

    diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
    index 86624b1331ef..558a7607bf93 100644
    --- a/security/integrity/ima/ima_policy.c
    +++ b/security/integrity/ima/ima_policy.c
    @@ -590,8 +590,14 @@ static void add_rules(struct ima_rule_entry *entries, int count,

    list_add_tail(&entry->list, &ima_policy_rules);
    }
    - if (entries[i].action == APPRAISE)
    - temp_ima_appraise |= ima_appraise_flag(entries[i].func);
    + if (entries[i].action == APPRAISE) {
    + if (entries != build_appraise_rules)
    + temp_ima_appraise |=
    + ima_appraise_flag(entries[i].func);
    + else
    + build_ima_appraise |=
    + ima_appraise_flag(entries[i].func);
    + }
    }
    }

    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-19 18:01    [W:4.100 / U:0.188 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site