Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Paul Moore <paul@paul-moore.com>
To:     Yunfeng Ye <yeyunfeng@huawei.com>, <eparis@redhat.com>
CC:     <linux-audit@redhat.com>, <linux-kernel@vger.kernel.org>,
        <hushiyuan@huawei.com>, <linfeilong@huawei.com>
Date:   Fri, 25 Oct 2019 07:43:37 +0200
Message-ID: <16e0170d878.280e.85c95baa4474aabc7814e68940a78392@paul-moore.com>
In-Reply-To: <7869bb43-5cb1-270a-07d1-31574595e13e@huawei.com>
References: <7869bb43-5cb1-270a-07d1-31574595e13e@huawei.com>
User-Agent: AquaMail/1.20.0-1469 (build: 102100004)
Subject: Re: [PATCH] audit: remove redundant condition check in kauditd_thread()
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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 ex=
pect to merge this next week.


> 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 =3D kauditd_send_queue(sk, portid,
>  &audit_hold_queue, UNICAST_RETRIES,
>  NULL, kauditd_rehold_skb);
> - if (ac && rc < 0) {
> + if (rc < 0) {
>  sk =3D NULL;
>  auditd_reset(ac);
>  goto main_queue;
> @@ -840,7 +840,7 @@ static int kauditd_thread(void *dummy)
>  rc =3D kauditd_send_queue(sk, portid,
>  &audit_retry_queue, UNICAST_RETRIES,
>  NULL, kauditd_hold_skb);
> - if (ac && rc < 0) {
> + if (rc < 0) {
>  sk =3D NULL;
>  auditd_reset(ac);
>  goto main_queue;
> --
> 2.7.4.3

--
paul moore
www.paul-moore.com