Messages in this thread | | | Subject | Re: [PATCH] audit: remove redundant condition check in kauditd_thread() | From | Yunfeng Ye <> | Date | Fri, 25 Oct 2019 15:14:24 +0800 |
| |
On 2019/10/25 13:43, Paul Moore wrote: > On October 23, 2019 3:27:50 PM Yunfeng Ye <yeyunfeng@huawei.com> wrote: >> Warning is found by the code analysis tool: >> "the condition 'if(ac && rc < 0)' is redundant: ac" >> >> >> The @ac variable has been checked before. It can't be a null pointer >> here, so remove the redundant condition check. >> >> >> Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com> >> --- >> kernel/audit.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) > > Hello, > > Thank you for the patch. Looking quickly at it, it appears to be correct, unfortunately I'm not in a position to merge non-critical patches, but I expect to merge this next week. > ok, thanks.
> >> diff --git a/kernel/audit.c b/kernel/audit.c >> index da8dc0db5bd3..193f3a1f4425 100644 >> --- a/kernel/audit.c >> +++ b/kernel/audit.c >> @@ -830,7 +830,7 @@ static int kauditd_thread(void *dummy) >> rc = kauditd_send_queue(sk, portid, >> &audit_hold_queue, UNICAST_RETRIES, >> NULL, kauditd_rehold_skb); >> - if (ac && rc < 0) { >> + if (rc < 0) { >> sk = NULL; >> auditd_reset(ac); >> goto main_queue; >> @@ -840,7 +840,7 @@ static int kauditd_thread(void *dummy) >> rc = kauditd_send_queue(sk, portid, >> &audit_retry_queue, UNICAST_RETRIES, >> NULL, kauditd_hold_skb); >> - if (ac && rc < 0) { >> + if (rc < 0) { >> sk = NULL; >> auditd_reset(ac); >> goto main_queue; >> -- >> 2.7.4.3 > > -- > paul moore > www.paul-moore.com > > > > > >
| |