From: John Hubbard <jhubbard@nvidia.com>
To: Colin King <colin.king@canonical.com>,
Andrew Morton <akpm@linux-foundation.org>,
Minchan Kim <minchan@kernel.org>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
<linux-mm@kvack.org>
Cc: <kernel-janitors@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] mm: cma: Fix potential null dereference on pointer cma
Date: Wed, 17 Mar 2021 00:13:31 -0700 [thread overview]
Message-ID: <c2881c32-4354-437d-749c-d6dd419e5a4d@nvidia.com> (raw)
In-Reply-To: <20210316100433.17665-1-colin.king@canonical.com>
On 3/16/21 3:04 AM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> At the start of the function there is a null pointer check on cma
> and then branch to error handling label 'out'. The subsequent call
> to cma_sysfs_fail_pages_count dereferences cma, hence there is a
> potential null pointer deference issue. Fix this by only calling
As far as I can tell, it's not possible to actually cause that null
failure with the existing kernel code paths. *Might* be worth mentioning
that here (unless I'm wrong), but either way, looks good, so:
Reviewed-by: John Hubbard <jhubbard@nvidia.com>
thanks,
--
John Hubbard
NVIDIA
> cma_sysfs_fail_pages_count if cma is not null.
>
> Addresses-Coverity: ("Dereference after null check")
> Fixes: dc4764f7e9ac ("mm: cma: support sysfs")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> mm/cma.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/mm/cma.c b/mm/cma.c
> index 6d4dbafdb318..90e27458ddb7 100644
> --- a/mm/cma.c
> +++ b/mm/cma.c
> @@ -512,7 +512,8 @@ struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align,
> cma_sysfs_alloc_pages_count(cma, count);
> } else {
> count_vm_event(CMA_ALLOC_FAIL);
> - cma_sysfs_fail_pages_count(cma, count);
> + if (cma)
> + cma_sysfs_fail_pages_count(cma, count);
> }
>
> return page;
>
prev parent reply other threads:[~2021-03-17 7:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-16 10:04 [PATCH] mm: cma: Fix potential null dereference on pointer cma Colin King
2021-03-16 18:09 ` Minchan Kim
2021-03-17 7:13 ` John Hubbard [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=c2881c32-4354-437d-749c-d6dd419e5a4d@nvidia.com \
--to=jhubbard@nvidia.com \
--cc=akpm@linux-foundation.org \
--cc=colin.king@canonical.com \
--cc=gregkh@linuxfoundation.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=minchan@kernel.org \
--cc=sfr@canb.auug.org.au \
/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 NNTP newsgroup(s).