]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop 1 patch based on RC review feedback
authorSasha Levin <sashal@kernel.org>
Fri, 31 Jul 2026 14:51:05 +0000 (10:51 -0400)
committerSasha Levin <sashal@kernel.org>
Fri, 31 Jul 2026 14:51:05 +0000 (10:51 -0400)
Dropped patches:

- "mtd: maps: vmu-flash: fix fault in unaligned fixup"
  Upstream: 79d1661502c6e4b6f626185cef72cf2fa78116e1
  Queues: 6.6
  Reason: malformed backport -- the removal side of every hunk was
    context-adjusted down to the 6.6 kmalloc()/kmalloc_array() code, but
    the addition side was left verbatim from upstream and still calls
    kzalloc_obj()/kzalloc_objs(). Those helpers came from 2932ba8d9c99
    ("slab: Introduce kmalloc_obj() and family"), which is not in 6.6, so
    any config that builds drivers/mtd/maps/vmu-flash.c (CONFIG_MTD_VMU,
    sh/Dreamcast) fails to compile. Same root cause as the stratix10-svc
    build regression already dropped from 6.1/6.6. The 6.12 and 6.18
    copies are unaffected -- those bases define the helpers -- and stay
    queued. The upstream fix is valid and can be requeued for 6.6 as a
    properly adapted backport using kzalloc()/kcalloc().
  Report: https://lore.kernel.org/stable/178542714373.4058.4312420996135460246@kernelci.org/

Signed-off-by: Sasha Levin <sashal@kernel.org>
queue-6.6/mtd-maps-vmu-flash-fix-fault-in-unaligned-fixup.patch [deleted file]
queue-6.6/series

diff --git a/queue-6.6/mtd-maps-vmu-flash-fix-fault-in-unaligned-fixup.patch b/queue-6.6/mtd-maps-vmu-flash-fix-fault-in-unaligned-fixup.patch
deleted file mode 100644 (file)
index 600b499..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-From stable+bounces-289096-greg=kroah.com@vger.kernel.org Sat Jul 25 14:15:04 2026
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 25 Jul 2026 08:14:47 -0400
-Subject: mtd: maps: vmu-flash: fix fault in unaligned fixup
-To: stable@vger.kernel.org
-Cc: Florian Fuchs <fuchsfl@gmail.com>, Miquel Raynal <miquel.raynal@bootlin.com>, Sasha Levin <sashal@kernel.org>
-Message-ID: <20260725121447.2570457-1-sashal@kernel.org>
-
-From: Florian Fuchs <fuchsfl@gmail.com>
-
-[ Upstream commit 79d1661502c6e4b6f626185cef72cf2fa78116e1 ]
-
-Use kzalloc_obj() / kzalloc_objs() to allocate the memcard structs,
-instead of kmalloc_obj() / kmalloc_objs() to prevent access to
-uninitialized data.
-
-Fixes runtime error: Fault in unaligned fixup: 0000 [#1] at
-mtd_get_fact_prot_info.
-
-Fixes: 47a72688fae7 ("mtd: flash mapping support for Dreamcast VMU.")
-Cc: stable@vger.kernel.org
-Signed-off-by: Florian Fuchs <fuchsfl@gmail.com>
-Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/mtd/maps/vmu-flash.c |    8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
---- a/drivers/mtd/maps/vmu-flash.c
-+++ b/drivers/mtd/maps/vmu-flash.c
-@@ -610,7 +610,7 @@ static int vmu_connect(struct maple_devi
-       basic_flash_data = be32_to_cpu(mdev->devinfo.function_data[c - 1]);
--      card = kmalloc(sizeof(struct memcard), GFP_KERNEL);
-+      card = kzalloc_obj(struct memcard);
-       if (!card) {
-               error = -ENOMEM;
-               goto fail_nomem;
-@@ -628,15 +628,13 @@ static int vmu_connect(struct maple_devi
-       * Not sure there are actually any multi-partition devices in the
-       * real world, but the hardware supports them, so, so will we
-       */
--      card->parts = kmalloc_array(card->partitions, sizeof(struct vmupart),
--                                  GFP_KERNEL);
-+      card->parts = kzalloc_objs(struct vmupart, card->partitions);
-       if (!card->parts) {
-               error = -ENOMEM;
-               goto fail_partitions;
-       }
--      card->mtd = kmalloc_array(card->partitions, sizeof(struct mtd_info),
--                                GFP_KERNEL);
-+      card->mtd = kzalloc_objs(struct mtd_info, card->partitions);
-       if (!card->mtd) {
-               error = -ENOMEM;
-               goto fail_mtd_info;
index 8ce6a84db09aa8d5d2f3b11c69275c6397e820d7..90ebc336fa4140fdf16ffc76f58c17b2f5394ab6 100644 (file)
@@ -421,7 +421,6 @@ sunrpc-allocate-a-separate-bvec-array-for-socket-sends.patch
 sunrpc-add-helpers-to-convert-xdr_buf-byte-ranges-to-scatterlists.patch
 sunrpc-return-an-error-from-xdr_buf_to_bvec-on-overflow.patch
 mm-mm_init-fix-pageblock-migratetype-for-zone_device-compound-pages.patch
-mtd-maps-vmu-flash-fix-fault-in-unaligned-fixup.patch
 mtd-rawnand-add-a-helper-for-calculating-a-page-index.patch
 mtd-rawnand-ensure-all-continuous-terms-are-always-in-sync.patch
 mtd-rawnand-pause-continuous-reads-at-block-boundaries.patch