Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20211013091208.36209-1-cuigaosheng1@huawei.com> <20211013091208.36209-2-cuigaosheng1@huawei.com>
In-Reply-To: <20211013091208.36209-2-cuigaosheng1@huawei.com>
From:   Paul Moore <paul@paul-moore.com>
Date:   Wed, 13 Oct 2021 17:12:38 -0400
Message-ID: <CAHC9VhQR4OZWRrQODEjBxhjpH3yPRqPFE4X6RkVFEmv1e9Z8iw@mail.gmail.com>
Subject: Re: [PATCH -next,v2 1/2] audit: fix possible null-pointer dereference
 in audit_filter_rules
To:     Gaosheng Cui <cuigaosheng1@huawei.com>
Cc:     Eric Paris <eparis@redhat.com>, linux-audit@redhat.com,
        linux-kernel@vger.kernel.org, xiujianfeng@huawei.com,
        wangweiyang2@huawei.com
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Wed, Oct 13, 2021 at 5:10 AM Gaosheng Cui <cuigaosheng1@huawei.com> wrote:
>
> Fix this possible null-pointer dereference in audit_filter_rules.

Thanks for fixing this, just a couple of small comments:

I think you can drop the description text below here, the code snippet
is just a duplicate of the code and the error message is pretty
obvious.

> If ctx is null, a null-pointer dereference will occur:
>     case AUDIT_SADDR_FAM:
>         if (ctx->sockaddr)
>                 ...
>         break;
>
> audit_filter_rules() error: we previously assumed 'ctx' could be null
>
> Reported-by: kernel test robot <lkp@intel.com>
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>

I would also add a Fixes tag, for example:

Fixes: bf361231c295 ("audit: add saddr_fam filter field")

> ---
>  kernel/auditsc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/auditsc.c b/kernel/auditsc.c
> index 4ba3b8573ff4..42d4a4320526 100644
> --- a/kernel/auditsc.c
> +++ b/kernel/auditsc.c
> @@ -647,7 +647,7 @@ static int audit_filter_rules(struct task_struct *tsk,
>                         result = audit_comparator(audit_loginuid_set(tsk), f->op, f->val);
>                         break;
>                 case AUDIT_SADDR_FAM:
> -                       if (ctx->sockaddr)
> +                       if (ctx && ctx->sockaddr)
>                                 result = audit_comparator(ctx->sockaddr->ss_family,
>                                                           f->op, f->val);
>                         break;
> --
> 2.30.0

-- 
paul moore
www.paul-moore.com