From: cuigaosheng <cuigaosheng1@huawei.com>
To: Paul Moore <paul@paul-moore.com>
Cc: xiujianfeng@huawei.com, wangweiyang2@huawei.com,
linux-audit@redhat.com, linux-kernel@vger.kernel.org,
Eric Paris <eparis@redhat.com>
Subject: Re: [PATCH -next, v2 2/2] audit: return early if the rule has a lower priority
Date: Sat, 16 Oct 2021 16:02:13 +0800 [thread overview]
Message-ID: <0e4cf616-c362-9748-7803-07aedde5f62e@huawei.com> (raw)
In-Reply-To: <CAHC9VhQTD86Y9ryGNkVKsChJ573GAka_gBuTgXR8q5OpV-zMbw@mail.gmail.com>
I have done some testing with this patch, we have some testsuites to
verify the
function of audit, and i will test it with the audit-testsuite.
Thanks.
Gaosheng
在 2021/10/14 5:15, Paul Moore 写道:
> On Wed, Oct 13, 2021 at 5:10 AM Gaosheng Cui <cuigaosheng1@huawei.com> wrote:
>> It is not necessary for audit_filter_rules() functions to check
>> audit fileds of the rule with a lower priority, and if we did,
>> there might be some unintended effects, such as the ctx->ppid
>> may be changed unexpectedly, so return early if the rule has
>> a lower priority.
>>
>> Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
>> ---
>> kernel/auditsc.c | 5 +++--
>> 1 file changed, 3 insertions(+), 2 deletions(-)
> Thanks for this patch, it looks reasonable to me but have you done any
> testing with this patch? If so, what have you done?
>
> As a FYI, the audit-testsuite project lives here:
> * https://github.com/linux-audit/audit-testsuite
>
>> diff --git a/kernel/auditsc.c b/kernel/auditsc.c
>> index 42d4a4320526..b517947bfa48 100644
>> --- a/kernel/auditsc.c
>> +++ b/kernel/auditsc.c
>> @@ -470,6 +470,9 @@ static int audit_filter_rules(struct task_struct *tsk,
>> u32 sid;
>> unsigned int sessionid;
>>
>> + if (ctx && rule->prio <= ctx->prio)
>> + return 0;
>> +
>> cred = rcu_dereference_check(tsk->cred, tsk == current || task_creation);
>>
>> for (i = 0; i < rule->field_count; i++) {
>> @@ -737,8 +740,6 @@ static int audit_filter_rules(struct task_struct *tsk,
>> }
>>
>> if (ctx) {
>> - if (rule->prio <= ctx->prio)
>> - return 0;
>> if (rule->filterkey) {
>> kfree(ctx->filterkey);
>> ctx->filterkey = kstrdup(rule->filterkey, GFP_ATOMIC);
>> --
>> 2.30.0
--
Linux-audit mailing list
Linux-audit@redhat.com
https://listman.redhat.com/mailman/listinfo/linux-audit
prev parent reply other threads:[~2021-10-16 8:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-13 9:12 [PATCH -next,v2 0/2] Audit: fix warning and check priority early Gaosheng Cui
2021-10-13 9:12 ` [PATCH -next, v2 1/2] audit: fix possible null-pointer dereference in audit_filter_rules Gaosheng Cui
2021-10-13 21:12 ` Paul Moore
2021-10-16 7:47 ` cuigaosheng
2021-10-13 9:12 ` [PATCH -next, v2 2/2] audit: return early if the rule has a lower priority Gaosheng Cui
2021-10-13 21:15 ` Paul Moore
2021-10-16 8:02 ` cuigaosheng [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0e4cf616-c362-9748-7803-07aedde5f62e@huawei.com \
--to=cuigaosheng1@huawei.com \
--cc=eparis@redhat.com \
--cc=linux-audit@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=paul@paul-moore.com \
--cc=wangweiyang2@huawei.com \
--cc=xiujianfeng@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).