From: Sergei Shtepa <sergei.shtepa@veeam.com>
To: Jens Axboe <axboe@kernel.dk>, <linux-block@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Cc: <sergei.shtepa@veeam.com>, <pavel.tide@veeam.com>
Subject: [PATCH 1/1] block: fix potential infinite loop in the negative branch in __submit_bio_noacct_mq()
Date: Tue, 23 Mar 2021 14:48:36 +0300 [thread overview]
Message-ID: <1616500116-3411-2-git-send-email-sergei.shtepa@veeam.com> (raw)
In-Reply-To: <1616500116-3411-1-git-send-email-sergei.shtepa@veeam.com>
When the blk_crypto_bio_prep() function returns false, the processing
of the bio request must end. Repeated access to blk_crypto_bio_prep()
for this same bio may lead to access to already released data, since in
this case the bio_endio() function was already called for bio.
The changes allow to leave the processing of the failed bio and
go to the next one from the bio_list.
The error can only occur when using inline encryption on
request-based blk-mq devices and something went wrong in the
__blk_crypto_bio_prep().
Signed-off-by: Sergei Shtepa <sergei.shtepa@veeam.com>
---
block/blk-core.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/block/blk-core.c b/block/blk-core.c
index fc60ff208497..825df223b01d 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1005,13 +1005,12 @@ static blk_qc_t __submit_bio_noacct_mq(struct bio *bio)
if (unlikely(bio_queue_enter(bio) != 0))
continue;
- if (!blk_crypto_bio_prep(&bio)) {
+ if (blk_crypto_bio_prep(&bio))
+ ret = blk_mq_submit_bio(bio);
+ else {
blk_queue_exit(disk->queue);
ret = BLK_QC_T_NONE;
- continue;
}
-
- ret = blk_mq_submit_bio(bio);
} while ((bio = bio_list_pop(&bio_list[0])));
current->bio_list = NULL;
--
2.20.1
next prev parent reply other threads:[~2021-03-23 11:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-23 11:48 [PATCH 0/1] " Sergei Shtepa
2021-03-23 11:48 ` Sergei Shtepa [this message]
2021-03-24 11:18 ` [PATCH 1/1] " Christoph Hellwig
2021-03-24 15:14 ` Sergei Shtepa
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=1616500116-3411-2-git-send-email-sergei.shtepa@veeam.com \
--to=sergei.shtepa@veeam.com \
--cc=axboe@kernel.dk \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pavel.tide@veeam.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®