5.4-stable patches

added patches:
	blk-mq-make-sure-that-line-break-can-be-printed.patch
	workqueue-fix-missing-kfree-rescuer-in-destroy_workqueue.patch

diff --git a/queue-5.4/blk-mq-make-sure-that-line-break-can-be-printed.patch b/queue-5.4/blk-mq-make-sure-that-line-break-can-be-printed.patch
new file mode 100644 (file)
index 0000000..d7635fc
--- /dev/null
+++ b/queue-5.4/blk-mq-make-sure-that-line-break-can-be-printed.patch
@@ -0,0 +1,35 @@
+From d2c9be89f8ebe7ebcc97676ac40f8dec1cf9b43a Mon Sep 17 00:00:00 2001
+From: Ming Lei <ming.lei@redhat.com>
+Date: Mon, 4 Nov 2019 16:26:53 +0800
+Subject: blk-mq: make sure that line break can be printed
+
+From: Ming Lei <ming.lei@redhat.com>
+
+commit d2c9be89f8ebe7ebcc97676ac40f8dec1cf9b43a upstream.
+
+8962842ca5ab ("blk-mq: avoid sysfs buffer overflow with too many CPU cores")
+avoids sysfs buffer overflow, and reserves one character for line break.
+However, the last snprintf() doesn't get correct 'size' parameter passed
+in, so fixed it.
+
+Fixes: 8962842ca5ab ("blk-mq: avoid sysfs buffer overflow with too many CPU cores")
+Signed-off-by: Ming Lei <ming.lei@redhat.com>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Cc: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ block/blk-mq-sysfs.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/block/blk-mq-sysfs.c
++++ b/block/blk-mq-sysfs.c
+@@ -183,7 +183,7 @@ static ssize_t blk_mq_hw_sysfs_cpus_show
+               pos += ret;
+       }
+ 
+-      ret = snprintf(pos + page, size - pos, "\n");
++      ret = snprintf(pos + page, size + 1 - pos, "\n");
+       return pos + ret;
+ }
+ 

diff --git a/queue-5.4/series b/queue-5.4/series
index 481db2ebfcf8f4497167a78295172264e0311d01..ac294b435a04002c782872652334dd3636e2926b 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -175,3 +175,5 @@ rtc-disable-uie-before-setting-time-and-enable-after.patch
 splice-only-read-in-as-much-information-as-there-is-pipe-buffer-space.patch
 ext4-fix-a-bug-in-ext4_wait_for_tail_page_commit.patch
 ext4-fix-leak-of-quota-reservations.patch
+blk-mq-make-sure-that-line-break-can-be-printed.patch
+workqueue-fix-missing-kfree-rescuer-in-destroy_workqueue.patch

diff --git a/queue-5.4/workqueue-fix-missing-kfree-rescuer-in-destroy_workqueue.patch b/queue-5.4/workqueue-fix-missing-kfree-rescuer-in-destroy_workqueue.patch
new file mode 100644 (file)
index 0000000..d5bfe4f
--- /dev/null
+++ b/queue-5.4/workqueue-fix-missing-kfree-rescuer-in-destroy_workqueue.patch
@@ -0,0 +1,29 @@
+From 8efe1223d73c218ce7e8b2e0e9aadb974b582d7f Mon Sep 17 00:00:00 2001
+From: Tejun Heo <tj@kernel.org>
+Date: Fri, 20 Sep 2019 13:39:57 -0700
+Subject: workqueue: Fix missing kfree(rescuer) in destroy_workqueue()
+
+From: Tejun Heo <tj@kernel.org>
+
+commit 8efe1223d73c218ce7e8b2e0e9aadb974b582d7f upstream.
+
+Signed-off-by: Tejun Heo <tj@kernel.org>
+Reported-by: Qian Cai <cai@lca.pw>
+Fixes: def98c84b6cd ("workqueue: Fix spurious sanity check failures in destroy_workqueue()")
+Cc: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ kernel/workqueue.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/kernel/workqueue.c
++++ b/kernel/workqueue.c
+@@ -4351,6 +4351,7 @@ void destroy_workqueue(struct workqueue_
+ 
+               /* rescuer will empty maydays list before exiting */
+               kthread_stop(rescuer->task);
++              kfree(rescuer);
+       }
+ 
+       /* sanity checks */