From: Eric Biggers <ebiggers@kernel.org>
To: Miaohe Lin <linmiaohe@huawei.com>
Cc: axboe@kernel.dk, satyat@google.com, linux-block@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] block: Fix potential NULL pointer dereference in __bio_crypt_clone()
Date: Tue, 1 Sep 2020 09:07:03 -0700 [thread overview]
Message-ID: <20200901160703.GA669796@gmail.com> (raw)
In-Reply-To: <20200901115921.8926-1-linmiaohe@huawei.com>
On Tue, Sep 01, 2020 at 07:59:21AM -0400, Miaohe Lin wrote:
> mempool_alloc() may return NULL if __GFP_DIRECT_RECLAIM is not set in
> gfp_mask under memory pressure. So we should check the return value of
> mempool_alloc() against NULL before dereference.
>
> Fixes: a892c8d52c02 ("block: Inline encryption support for blk-mq")
> Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
> ---
> block/blk-crypto.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/block/blk-crypto.c b/block/blk-crypto.c
> index 2d5e60023b08..046aff85cfa3 100644
> --- a/block/blk-crypto.c
> +++ b/block/blk-crypto.c
> @@ -98,7 +98,8 @@ void __bio_crypt_free_ctx(struct bio *bio)
> void __bio_crypt_clone(struct bio *dst, struct bio *src, gfp_t gfp_mask)
> {
> dst->bi_crypt_context = mempool_alloc(bio_crypt_ctx_pool, gfp_mask);
> - *dst->bi_crypt_context = *src->bi_crypt_context;
> + if (likely(dst->bi_crypt_context))
> + *dst->bi_crypt_context = *src->bi_crypt_context;
> }
> EXPORT_SYMBOL_GPL(__bio_crypt_clone);
It's intended that __GFP_DIRECT_RECLAIM always be set here.
Do you have an example where it isn't set here?
Also, if this can indeed happen, then we need to make __bio_crypt_clone()
(and bio_crypt_clone()) return a bool (or an error code) to indicate whether it
succeeded or failed. We can't just ignore the allocation failure.
- Eric
next prev parent reply other threads:[~2020-09-01 16:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-01 11:59 [PATCH] block: Fix potential NULL pointer dereference in __bio_crypt_clone() Miaohe Lin
2020-09-01 16:07 ` Eric Biggers [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-09-02 1:56 linmiaohe
2020-09-02 5:22 ` Eric Biggers
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=20200901160703.GA669796@gmail.com \
--to=ebiggers@kernel.org \
--cc=axboe@kernel.dk \
--cc=linmiaohe@huawei.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=satyat@google.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.