5.4-stable patches

added patches:
	md-bcache-check-the-return-value-of-kzalloc-in-detached_dev_do_request.patch

diff --git a/queue-5.4/md-bcache-check-the-return-value-of-kzalloc-in-detached_dev_do_request.patch b/queue-5.4/md-bcache-check-the-return-value-of-kzalloc-in-detached_dev_do_request.patch
new file mode 100644 (file)
index 0000000..bec7fc6
--- /dev/null
+++ b/queue-5.4/md-bcache-check-the-return-value-of-kzalloc-in-detached_dev_do_request.patch
@@ -0,0 +1,38 @@
+From 40f567bbb3b0639d2ec7d1c6ad4b1b018f80cf19 Mon Sep 17 00:00:00 2001
+From: Jia-Ju Bai <baijiaju1990@gmail.com>
+Date: Fri, 27 May 2022 23:28:18 +0800
+Subject: md: bcache: check the return value of kzalloc() in detached_dev_do_request()
+
+From: Jia-Ju Bai <baijiaju1990@gmail.com>
+
+commit 40f567bbb3b0639d2ec7d1c6ad4b1b018f80cf19 upstream.
+
+The function kzalloc() in detached_dev_do_request() can fail, so its
+return value should be checked.
+
+Fixes: bc082a55d25c ("bcache: fix inaccurate io state for detached bcache devices")
+Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
+Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
+Signed-off-by: Coly Li <colyli@suse.de>
+Link: https://lore.kernel.org/r/20220527152818.27545-4-colyli@suse.de
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/md/bcache/request.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/drivers/md/bcache/request.c
++++ b/drivers/md/bcache/request.c
+@@ -1119,6 +1119,12 @@ static void detached_dev_do_request(stru
+        * which would call closure_get(&dc->disk.cl)
+        */
+       ddip = kzalloc(sizeof(struct detached_dev_io_private), GFP_NOIO);
++      if (!ddip) {
++              bio->bi_status = BLK_STS_RESOURCE;
++              bio->bi_end_io(bio);
++              return;
++      }
++
+       ddip->d = d;
+       ddip->start_time = jiffies;
+       ddip->bi_end_io = bio->bi_end_io;

diff --git a/queue-5.4/series b/queue-5.4/series
index 5a406c9510c78c1211164d33f490181ccc8c99c2..bae17fb4f1937faaf1708a95a0be2d79582881e1 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -278,3 +278,4 @@ bfq-remove-pointless-bfq_init_rq-calls.patch
 bfq-get-rid-of-__bio_blkcg-usage.patch
 bfq-make-sure-bfqg-for-which-we-are-queueing-requests-is-online.patch
 block-fix-bio_clone_blkg_association-to-associate-with-proper-blkcg_gq.patch
+md-bcache-check-the-return-value-of-kzalloc-in-detached_dev_do_request.patch