From 596ca91959b3233e24940b45a065b05687ab12f2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 16 Sep 2021 10:37:14 +0200 Subject: [PATCH] 5.4-stable patches added patches: revert-block-nbd-add-sanity-check-for-first_minor.patch --- ...nbd-add-sanity-check-for-first_minor.patch | 44 +++++++++++++++++++ queue-5.4/series | 1 + 2 files changed, 45 insertions(+) create mode 100644 queue-5.4/revert-block-nbd-add-sanity-check-for-first_minor.patch diff --git a/queue-5.4/revert-block-nbd-add-sanity-check-for-first_minor.patch b/queue-5.4/revert-block-nbd-add-sanity-check-for-first_minor.patch new file mode 100644 index 00000000000..a34273e4acf --- /dev/null +++ b/queue-5.4/revert-block-nbd-add-sanity-check-for-first_minor.patch @@ -0,0 +1,44 @@ +From edf59055b2b832f4a57f6b1787812c368599ce9d Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Thu, 16 Sep 2021 10:17:11 +0200 +Subject: Revert "block: nbd: add sanity check for first_minor" + +From: Greg Kroah-Hartman + +This reverts commit b3fa499d72a0db612f12645265a36751955c0037 which is +commit b1a811633f7321cf1ae2bb76a66805b7720e44c9 upstream. + +The backport of this is reported to be causing some problems, so revert +this for now until they are worked out. + +Link: https://lore.kernel.org/r/CACPK8XfUWoOHr-0RwRoYoskia4fbAbZ7DYf5wWBnv6qUnGq18w@mail.gmail.com +Reported-by: Joel Stanley +Cc: Christoph Hellwig +Cc: Pavel Skripkin +Cc: Jens Axboe +Cc: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/block/nbd.c | 10 ---------- + 1 file changed, 10 deletions(-) + +--- a/drivers/block/nbd.c ++++ b/drivers/block/nbd.c +@@ -1744,17 +1744,7 @@ static int nbd_dev_add(int index) + refcount_set(&nbd->refs, 1); + INIT_LIST_HEAD(&nbd->list); + disk->major = NBD_MAJOR; +- +- /* Too big first_minor can cause duplicate creation of +- * sysfs files/links, since first_minor will be truncated to +- * byte in __device_add_disk(). +- */ + disk->first_minor = index << part_shift; +- if (disk->first_minor > 0xff) { +- err = -EINVAL; +- goto out_free_idr; +- } +- + disk->fops = &nbd_fops; + disk->private_data = nbd; + sprintf(disk->disk_name, "nbd%d", index); diff --git a/queue-5.4/series b/queue-5.4/series index 88454ec1ffe..d997e43c0af 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -176,3 +176,4 @@ ath9k-fix-sleeping-in-atomic-context.patch net-fix-null-pointer-reference-in-cipso_v4_doi_free.patch fix-array-index-out-of-bounds-in-taprio_change.patch net-w5100-check-return-value-after-calling-platform_.patch +revert-block-nbd-add-sanity-check-for-first_minor.patch -- 2.47.2