From: Vitaly Wool <vitaly.wool@konsulko.com>
To: Miaohe Lin <linmiaohe@huawei.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Linux-MM <linux-mm@kvack.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 2/9] mm/z3fold: fix possible null pointer dereferencing
Date: Thu, 19 May 2022 09:04:30 +0200 [thread overview]
Message-ID: <CAM4kBBLrKwDTsoD2nZMqge=qczf-iB7xtSTj8gydj+9KEYwu7g@mail.gmail.com> (raw)
In-Reply-To: <20220429064051.61552-3-linmiaohe@huawei.com>
On Fri, Apr 29, 2022 at 8:40 AM Miaohe Lin <linmiaohe@huawei.com> wrote:
>
> alloc_slots could fail to allocate memory under heavy memory pressure. So
> we should check zhdr->slots against NULL to avoid future null pointer
> dereferencing.
>
> Fixes: fc5488651c7d ("z3fold: simplify freeing slots")
> Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
> ---
> mm/z3fold.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/mm/z3fold.c b/mm/z3fold.c
> index c2260f5a5885..5d8c21f2bc59 100644
> --- a/mm/z3fold.c
> +++ b/mm/z3fold.c
> @@ -940,9 +940,19 @@ static inline struct z3fold_header *__z3fold_alloc(struct z3fold_pool *pool,
> }
> }
>
> - if (zhdr && !zhdr->slots)
> + if (zhdr && !zhdr->slots) {
> zhdr->slots = alloc_slots(pool, GFP_ATOMIC);
> + if (!zhdr->slots)
> + goto out_fail;
> + }
> return zhdr;
> +
> +out_fail:
> + if (!kref_put(&zhdr->refcount, release_z3fold_page_locked)) {
> + add_to_unbuddied(pool, zhdr);
> + z3fold_page_unlock(zhdr);
> + }
> + return NULL;
> }
Reviewed-by: Vitaly Wool <vitaly.wool@konsulko.com>
> /*
> --
> 2.23.0
>
next prev parent reply other threads:[~2022-05-19 7:04 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-29 6:40 [PATCH 0/9] A few fixup patches for z3fold Miaohe Lin
2022-04-29 6:40 ` [PATCH 1/9] mm/z3fold: fix sheduling while atomic Miaohe Lin
2022-05-19 7:00 ` Vitaly Wool
2022-04-29 6:40 ` [PATCH 2/9] mm/z3fold: fix possible null pointer dereferencing Miaohe Lin
2022-05-19 7:04 ` Vitaly Wool [this message]
2022-04-29 6:40 ` [PATCH 3/9] mm/z3fold: remove buggy use of stale list for allocation Miaohe Lin
2022-05-19 7:06 ` Vitaly Wool
2022-04-29 6:40 ` [PATCH 4/9] mm/z3fold: throw warning on failure of trylock_page in z3fold_alloc Miaohe Lin
2022-05-19 7:10 ` Vitaly Wool
2022-05-19 11:10 ` Miaohe Lin
2022-04-29 6:40 ` [PATCH 5/9] revert "mm/z3fold.c: allow __GFP_HIGHMEM in z3fold_alloc" Miaohe Lin
2022-05-19 7:12 ` Vitaly Wool
2022-05-19 11:34 ` Miaohe Lin
2022-05-19 18:31 ` Andrew Morton
2022-05-20 2:30 ` Miaohe Lin
2022-04-29 6:40 ` [PATCH 6/9] mm/z3fold: put z3fold page back into unbuddied list when reclaim or migration fails Miaohe Lin
2022-05-19 7:13 ` Vitaly Wool
2022-04-29 6:40 ` [PATCH 7/9] mm/z3fold: always clear PAGE_CLAIMED under z3fold page lock Miaohe Lin
2022-05-19 7:14 ` Vitaly Wool
2022-04-29 6:40 ` [PATCH 8/9] mm/z3fold: fix z3fold_reclaim_page races with z3fold_free Miaohe Lin
2022-05-19 7:24 ` Vitaly Wool
2022-04-29 6:40 ` [PATCH 9/9] mm/z3fold: fix z3fold_page_migrate races with z3fold_map Miaohe Lin
2022-05-19 7:28 ` Vitaly Wool
2022-05-17 23:45 ` [PATCH 0/9] A few fixup patches for z3fold Andrew Morton
2022-05-18 2:01 ` Miaohe Lin
2022-05-18 10:39 ` Vitaly Wool
2022-05-19 1:54 ` Miaohe Lin
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='CAM4kBBLrKwDTsoD2nZMqge=qczf-iB7xtSTj8gydj+9KEYwu7g@mail.gmail.com' \
--to=vitaly.wool@konsulko.com \
--cc=akpm@linux-foundation.org \
--cc=linmiaohe@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/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).