From: Greg Kroah-Hartman Date: Sat, 9 Sep 2023 21:33:22 +0000 (+0100) Subject: drop queue-5.15/block-don-t-add-or-resize-partition-on-the-disk-with-genhd_fl_no_part... X-Git-Tag: v6.1.53~64 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c26268396c50a5090ef289454f07e563c7b5da8d;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-5.15/block-don-t-add-or-resize-partition-on-the-disk-with-genhd_fl_no_part.patch --- diff --git a/queue-5.15/block-don-t-add-or-resize-partition-on-the-disk-with-genhd_fl_no_part.patch b/queue-5.15/block-don-t-add-or-resize-partition-on-the-disk-with-genhd_fl_no_part.patch deleted file mode 100644 index 7da861eb366..00000000000 --- a/queue-5.15/block-don-t-add-or-resize-partition-on-the-disk-with-genhd_fl_no_part.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 1a721de8489fa559ff4471f73c58bb74ac5580d3 Mon Sep 17 00:00:00 2001 -From: Li Lingfeng -Date: Thu, 31 Aug 2023 15:59:00 +0800 -Subject: block: don't add or resize partition on the disk with GENHD_FL_NO_PART - -From: Li Lingfeng - -commit 1a721de8489fa559ff4471f73c58bb74ac5580d3 upstream. - -Commit a33df75c6328 ("block: use an xarray for disk->part_tbl") remove -disk_expand_part_tbl() in add_partition(), which means all kinds of -devices will support extended dynamic `dev_t`. -However, some devices with GENHD_FL_NO_PART are not expected to add or -resize partition. -Fix this by adding check of GENHD_FL_NO_PART before add or resize -partition. - -Fixes: a33df75c6328 ("block: use an xarray for disk->part_tbl") -Signed-off-by: Li Lingfeng -Reviewed-by: Christoph Hellwig -Link: https://lore.kernel.org/r/20230831075900.1725842-1-lilingfeng@huaweicloud.com -Signed-off-by: Jens Axboe -Signed-off-by: Greg Kroah-Hartman ---- - block/ioctl.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/block/ioctl.c -+++ b/block/ioctl.c -@@ -20,6 +20,8 @@ static int blkpg_do_ioctl(struct block_d - struct blkpg_partition p; - long long start, length; - -+ if (disk->flags & GENHD_FL_NO_PART) -+ return -EINVAL; - if (!capable(CAP_SYS_ADMIN)) - return -EACCES; - if (copy_from_user(&p, upart, sizeof(struct blkpg_partition))) diff --git a/queue-5.15/series b/queue-5.15/series index 886742464b1..30addc63ea4 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -350,7 +350,6 @@ ntb-drop-packets-when-qp-link-is-down.patch ntb-clean-up-tx-tail-index-on-link-down.patch ntb-fix-calculation-ntb_transport_tx_free_entry.patch revert-pci-mark-nvidia-t4-gpus-to-avoid-bus-reset.patch -block-don-t-add-or-resize-partition-on-the-disk-with-genhd_fl_no_part.patch procfs-block-chmod-on-proc-thread-self-comm.patch parisc-fix-proc-cpuinfo-output-for-lscpu.patch bpf-fix-issue-in-verifying-allow_ptr_leaks.patch