]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop bootconfig patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 19 Aug 2025 12:26:05 +0000 (14:26 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 19 Aug 2025 12:26:05 +0000 (14:26 +0200)
queue-6.1/bootconfig-fix-unaligned-access-when-building-footer.patch [deleted file]
queue-6.1/series
queue-6.12/bootconfig-fix-unaligned-access-when-building-footer.patch [deleted file]
queue-6.12/series
queue-6.15/bootconfig-fix-unaligned-access-when-building-footer.patch [deleted file]
queue-6.15/series
queue-6.16/bootconfig-fix-unaligned-access-when-building-footer.patch [deleted file]
queue-6.16/series
queue-6.6/bootconfig-fix-unaligned-access-when-building-footer.patch [deleted file]
queue-6.6/series

diff --git a/queue-6.1/bootconfig-fix-unaligned-access-when-building-footer.patch b/queue-6.1/bootconfig-fix-unaligned-access-when-building-footer.patch
deleted file mode 100644 (file)
index 1db433b..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-From a679b5ac076185b45bb86f248c93636685b44630 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 23 Jul 2025 12:49:25 +0200
-Subject: bootconfig: Fix unaligned access when building footer
-
-From: Ben Hutchings <benh@debian.org>
-
-[ Upstream commit 6ed5e20466c79e3b3350bae39f678f73cf564b4e ]
-
-Currently we add padding between the bootconfig text and footer to
-ensure that the footer is aligned within the initramfs image.
-However, because only the bootconfig data is held in memory, not the
-full initramfs image, the footer may not be naturally aligned in
-memory.
-
-This can result in an alignment fault (SIGBUS) when writing the footer
-on some architectures, such as sparc.
-
-Build the footer in a struct on the stack before adding it to the
-buffer.
-
-References: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=sparc64&ver=6.16%7Erc7-1%7Eexp1&stamp=1753209801&raw=0
-Link: https://lore.kernel.org/all/aIC-NTw-cdm9ZGFw@decadent.org.uk/
-
-Signed-off-by: Ben Hutchings <benh@debian.org>
-Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/bootconfig/main.c | 24 +++++++++++++-----------
- 1 file changed, 13 insertions(+), 11 deletions(-)
-
-diff --git a/tools/bootconfig/main.c b/tools/bootconfig/main.c
-index 8a48cc2536f5..dce2d6ffcca5 100644
---- a/tools/bootconfig/main.c
-+++ b/tools/bootconfig/main.c
-@@ -11,6 +11,7 @@
- #include <string.h>
- #include <errno.h>
- #include <endian.h>
-+#include <assert.h>
- #include <linux/bootconfig.h>
-@@ -359,7 +360,12 @@ static int delete_xbc(const char *path)
- static int apply_xbc(const char *path, const char *xbc_path)
- {
--      char *buf, *data, *p;
-+      struct {
-+              uint32_t size;
-+              uint32_t csum;
-+              char magic[BOOTCONFIG_MAGIC_LEN];
-+      } footer;
-+      char *buf, *data;
-       size_t total_size;
-       struct stat stat;
-       const char *msg;
-@@ -430,17 +436,13 @@ static int apply_xbc(const char *path, const char *xbc_path)
-       size += pad;
-       /* Add a footer */
--      p = data + size;
--      *(uint32_t *)p = htole32(size);
--      p += sizeof(uint32_t);
-+      footer.size = htole32(size);
-+      footer.csum = htole32(csum);
-+      memcpy(footer.magic, BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_LEN);
-+      static_assert(sizeof(footer) == BOOTCONFIG_FOOTER_SIZE);
-+      memcpy(data + size, &footer, BOOTCONFIG_FOOTER_SIZE);
--      *(uint32_t *)p = htole32(csum);
--      p += sizeof(uint32_t);
--
--      memcpy(p, BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_LEN);
--      p += BOOTCONFIG_MAGIC_LEN;
--
--      total_size = p - data;
-+      total_size = size + BOOTCONFIG_FOOTER_SIZE;
-       ret = write(fd, data, total_size);
-       if (ret < total_size) {
--- 
-2.39.5
-
index 1efafd8dfdacfbe964b12c94341c7b10b17a57df..6604ed65216bc765b40579ff827a156b244a0f86 100644 (file)
@@ -110,7 +110,6 @@ alsa-pcm-rewrite-recalculate_boundary-to-avoid-costl.patch
 alsa-usb-audio-avoid-precedence-issues-in-mixer_quir.patch
 iio-adc-ad7768-1-ensure-sync_in-pulse-minimum-timing.patch
 asoc-codecs-rt5640-retry-device_id-verification.patch
-bootconfig-fix-unaligned-access-when-building-footer.patch
 xen-netfront-fix-tx-response-spurious-interrupts.patch
 net-usb-cdc-ncm-check-for-filtering-capability.patch
 ktest.pl-prevent-recursion-of-default-variable-optio.patch
diff --git a/queue-6.12/bootconfig-fix-unaligned-access-when-building-footer.patch b/queue-6.12/bootconfig-fix-unaligned-access-when-building-footer.patch
deleted file mode 100644 (file)
index 4f1512c..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-From 7374e988eb9d1da10f80713f4bad10891ef26016 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 23 Jul 2025 12:49:25 +0200
-Subject: bootconfig: Fix unaligned access when building footer
-
-From: Ben Hutchings <benh@debian.org>
-
-[ Upstream commit 6ed5e20466c79e3b3350bae39f678f73cf564b4e ]
-
-Currently we add padding between the bootconfig text and footer to
-ensure that the footer is aligned within the initramfs image.
-However, because only the bootconfig data is held in memory, not the
-full initramfs image, the footer may not be naturally aligned in
-memory.
-
-This can result in an alignment fault (SIGBUS) when writing the footer
-on some architectures, such as sparc.
-
-Build the footer in a struct on the stack before adding it to the
-buffer.
-
-References: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=sparc64&ver=6.16%7Erc7-1%7Eexp1&stamp=1753209801&raw=0
-Link: https://lore.kernel.org/all/aIC-NTw-cdm9ZGFw@decadent.org.uk/
-
-Signed-off-by: Ben Hutchings <benh@debian.org>
-Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/bootconfig/main.c | 24 +++++++++++++-----------
- 1 file changed, 13 insertions(+), 11 deletions(-)
-
-diff --git a/tools/bootconfig/main.c b/tools/bootconfig/main.c
-index 8a48cc2536f5..dce2d6ffcca5 100644
---- a/tools/bootconfig/main.c
-+++ b/tools/bootconfig/main.c
-@@ -11,6 +11,7 @@
- #include <string.h>
- #include <errno.h>
- #include <endian.h>
-+#include <assert.h>
- #include <linux/bootconfig.h>
-@@ -359,7 +360,12 @@ static int delete_xbc(const char *path)
- static int apply_xbc(const char *path, const char *xbc_path)
- {
--      char *buf, *data, *p;
-+      struct {
-+              uint32_t size;
-+              uint32_t csum;
-+              char magic[BOOTCONFIG_MAGIC_LEN];
-+      } footer;
-+      char *buf, *data;
-       size_t total_size;
-       struct stat stat;
-       const char *msg;
-@@ -430,17 +436,13 @@ static int apply_xbc(const char *path, const char *xbc_path)
-       size += pad;
-       /* Add a footer */
--      p = data + size;
--      *(uint32_t *)p = htole32(size);
--      p += sizeof(uint32_t);
-+      footer.size = htole32(size);
-+      footer.csum = htole32(csum);
-+      memcpy(footer.magic, BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_LEN);
-+      static_assert(sizeof(footer) == BOOTCONFIG_FOOTER_SIZE);
-+      memcpy(data + size, &footer, BOOTCONFIG_FOOTER_SIZE);
--      *(uint32_t *)p = htole32(csum);
--      p += sizeof(uint32_t);
--
--      memcpy(p, BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_LEN);
--      p += BOOTCONFIG_MAGIC_LEN;
--
--      total_size = p - data;
-+      total_size = size + BOOTCONFIG_FOOTER_SIZE;
-       ret = write(fd, data, total_size);
-       if (ret < total_size) {
--- 
-2.39.5
-
index 978eef3333c23bce8a5849bae5d979109b3365a3..a197d710bf8792aedfb493a59b069ab77703edbb 100644 (file)
@@ -157,7 +157,6 @@ asoc-qcom-use-drvdata-instead-of-component-to-keep-i.patch
 netfilter-nft_set_pipapo-prefer-kvmalloc-for-scratch.patch
 selftests-netfilter-enable-config_inet_sctp_diag.patch
 powerpc-thp-tracing-hide-hugepage-events-under-confi.patch
-bootconfig-fix-unaligned-access-when-building-footer.patch
 bluetooth-btusb-add-new-vid-pid-0489-e14e-for-mt7925.patch
 bluetooth-hci_sock-reset-cookie-to-zero-in-hci_sock_.patch
 xen-netfront-fix-tx-response-spurious-interrupts.patch
diff --git a/queue-6.15/bootconfig-fix-unaligned-access-when-building-footer.patch b/queue-6.15/bootconfig-fix-unaligned-access-when-building-footer.patch
deleted file mode 100644 (file)
index a7115ff..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-From b66feb0b11757660ea003747d1ef9d0c79fd6913 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 23 Jul 2025 12:49:25 +0200
-Subject: bootconfig: Fix unaligned access when building footer
-
-From: Ben Hutchings <benh@debian.org>
-
-[ Upstream commit 6ed5e20466c79e3b3350bae39f678f73cf564b4e ]
-
-Currently we add padding between the bootconfig text and footer to
-ensure that the footer is aligned within the initramfs image.
-However, because only the bootconfig data is held in memory, not the
-full initramfs image, the footer may not be naturally aligned in
-memory.
-
-This can result in an alignment fault (SIGBUS) when writing the footer
-on some architectures, such as sparc.
-
-Build the footer in a struct on the stack before adding it to the
-buffer.
-
-References: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=sparc64&ver=6.16%7Erc7-1%7Eexp1&stamp=1753209801&raw=0
-Link: https://lore.kernel.org/all/aIC-NTw-cdm9ZGFw@decadent.org.uk/
-
-Signed-off-by: Ben Hutchings <benh@debian.org>
-Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/bootconfig/main.c | 24 +++++++++++++-----------
- 1 file changed, 13 insertions(+), 11 deletions(-)
-
-diff --git a/tools/bootconfig/main.c b/tools/bootconfig/main.c
-index 8a48cc2536f5..dce2d6ffcca5 100644
---- a/tools/bootconfig/main.c
-+++ b/tools/bootconfig/main.c
-@@ -11,6 +11,7 @@
- #include <string.h>
- #include <errno.h>
- #include <endian.h>
-+#include <assert.h>
- #include <linux/bootconfig.h>
-@@ -359,7 +360,12 @@ static int delete_xbc(const char *path)
- static int apply_xbc(const char *path, const char *xbc_path)
- {
--      char *buf, *data, *p;
-+      struct {
-+              uint32_t size;
-+              uint32_t csum;
-+              char magic[BOOTCONFIG_MAGIC_LEN];
-+      } footer;
-+      char *buf, *data;
-       size_t total_size;
-       struct stat stat;
-       const char *msg;
-@@ -430,17 +436,13 @@ static int apply_xbc(const char *path, const char *xbc_path)
-       size += pad;
-       /* Add a footer */
--      p = data + size;
--      *(uint32_t *)p = htole32(size);
--      p += sizeof(uint32_t);
-+      footer.size = htole32(size);
-+      footer.csum = htole32(csum);
-+      memcpy(footer.magic, BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_LEN);
-+      static_assert(sizeof(footer) == BOOTCONFIG_FOOTER_SIZE);
-+      memcpy(data + size, &footer, BOOTCONFIG_FOOTER_SIZE);
--      *(uint32_t *)p = htole32(csum);
--      p += sizeof(uint32_t);
--
--      memcpy(p, BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_LEN);
--      p += BOOTCONFIG_MAGIC_LEN;
--
--      total_size = p - data;
-+      total_size = size + BOOTCONFIG_FOOTER_SIZE;
-       ret = write(fd, data, total_size);
-       if (ret < total_size) {
--- 
-2.39.5
-
index 4ad06163c931f251d9d0b07d667d440cff002fdf..6132353c0cc05d07a8fa2da29f1906031e87dc9d 100644 (file)
@@ -186,7 +186,6 @@ netfilter-nft_set_pipapo-prefer-kvmalloc-for-scratch.patch
 selftests-netfilter-enable-config_inet_sctp_diag.patch
 powerpc-thp-tracing-hide-hugepage-events-under-confi.patch
 verification-dot2k-make-a-separate-dot2k_templates-k.patch
-bootconfig-fix-unaligned-access-when-building-footer.patch
 bluetooth-btusb-add-new-vid-pid-0489-e14e-for-mt7925.patch
 bluetooth-hci_event-add-support-for-handling-le-big-.patch
 bluetooth-hci_sock-reset-cookie-to-zero-in-hci_sock_.patch
diff --git a/queue-6.16/bootconfig-fix-unaligned-access-when-building-footer.patch b/queue-6.16/bootconfig-fix-unaligned-access-when-building-footer.patch
deleted file mode 100644 (file)
index 77ee8fd..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-From 56515a9278e8f1f77f4abc8e8eb7672fbe23a610 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 23 Jul 2025 12:49:25 +0200
-Subject: bootconfig: Fix unaligned access when building footer
-
-From: Ben Hutchings <benh@debian.org>
-
-[ Upstream commit 6ed5e20466c79e3b3350bae39f678f73cf564b4e ]
-
-Currently we add padding between the bootconfig text and footer to
-ensure that the footer is aligned within the initramfs image.
-However, because only the bootconfig data is held in memory, not the
-full initramfs image, the footer may not be naturally aligned in
-memory.
-
-This can result in an alignment fault (SIGBUS) when writing the footer
-on some architectures, such as sparc.
-
-Build the footer in a struct on the stack before adding it to the
-buffer.
-
-References: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=sparc64&ver=6.16%7Erc7-1%7Eexp1&stamp=1753209801&raw=0
-Link: https://lore.kernel.org/all/aIC-NTw-cdm9ZGFw@decadent.org.uk/
-
-Signed-off-by: Ben Hutchings <benh@debian.org>
-Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/bootconfig/main.c | 24 +++++++++++++-----------
- 1 file changed, 13 insertions(+), 11 deletions(-)
-
-diff --git a/tools/bootconfig/main.c b/tools/bootconfig/main.c
-index 8a48cc2536f5..dce2d6ffcca5 100644
---- a/tools/bootconfig/main.c
-+++ b/tools/bootconfig/main.c
-@@ -11,6 +11,7 @@
- #include <string.h>
- #include <errno.h>
- #include <endian.h>
-+#include <assert.h>
- #include <linux/bootconfig.h>
-@@ -359,7 +360,12 @@ static int delete_xbc(const char *path)
- static int apply_xbc(const char *path, const char *xbc_path)
- {
--      char *buf, *data, *p;
-+      struct {
-+              uint32_t size;
-+              uint32_t csum;
-+              char magic[BOOTCONFIG_MAGIC_LEN];
-+      } footer;
-+      char *buf, *data;
-       size_t total_size;
-       struct stat stat;
-       const char *msg;
-@@ -430,17 +436,13 @@ static int apply_xbc(const char *path, const char *xbc_path)
-       size += pad;
-       /* Add a footer */
--      p = data + size;
--      *(uint32_t *)p = htole32(size);
--      p += sizeof(uint32_t);
-+      footer.size = htole32(size);
-+      footer.csum = htole32(csum);
-+      memcpy(footer.magic, BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_LEN);
-+      static_assert(sizeof(footer) == BOOTCONFIG_FOOTER_SIZE);
-+      memcpy(data + size, &footer, BOOTCONFIG_FOOTER_SIZE);
--      *(uint32_t *)p = htole32(csum);
--      p += sizeof(uint32_t);
--
--      memcpy(p, BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_LEN);
--      p += BOOTCONFIG_MAGIC_LEN;
--
--      total_size = p - data;
-+      total_size = size + BOOTCONFIG_FOOTER_SIZE;
-       ret = write(fd, data, total_size);
-       if (ret < total_size) {
--- 
-2.39.5
-
index 58e0327dc968847dc97c14e7154bcdfbb878e866..bb1a9c84ff4212b9f3e186d9b56e07e26d4bf86c 100644 (file)
@@ -202,7 +202,6 @@ netfilter-nft_set_pipapo-prefer-kvmalloc-for-scratch.patch
 selftests-netfilter-enable-config_inet_sctp_diag.patch
 powerpc-thp-tracing-hide-hugepage-events-under-confi.patch
 verification-dot2k-make-a-separate-dot2k_templates-k.patch
-bootconfig-fix-unaligned-access-when-building-footer.patch
 bluetooth-btusb-add-new-vid-pid-0489-e14e-for-mt7925.patch
 bluetooth-hci_event-add-support-for-handling-le-big-.patch
 bluetooth-hci_sock-reset-cookie-to-zero-in-hci_sock_.patch
diff --git a/queue-6.6/bootconfig-fix-unaligned-access-when-building-footer.patch b/queue-6.6/bootconfig-fix-unaligned-access-when-building-footer.patch
deleted file mode 100644 (file)
index 00e95b8..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-From d572d3efbf3b9e703ed222291b49b020d4e47fe5 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 23 Jul 2025 12:49:25 +0200
-Subject: bootconfig: Fix unaligned access when building footer
-
-From: Ben Hutchings <benh@debian.org>
-
-[ Upstream commit 6ed5e20466c79e3b3350bae39f678f73cf564b4e ]
-
-Currently we add padding between the bootconfig text and footer to
-ensure that the footer is aligned within the initramfs image.
-However, because only the bootconfig data is held in memory, not the
-full initramfs image, the footer may not be naturally aligned in
-memory.
-
-This can result in an alignment fault (SIGBUS) when writing the footer
-on some architectures, such as sparc.
-
-Build the footer in a struct on the stack before adding it to the
-buffer.
-
-References: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=sparc64&ver=6.16%7Erc7-1%7Eexp1&stamp=1753209801&raw=0
-Link: https://lore.kernel.org/all/aIC-NTw-cdm9ZGFw@decadent.org.uk/
-
-Signed-off-by: Ben Hutchings <benh@debian.org>
-Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/bootconfig/main.c | 24 +++++++++++++-----------
- 1 file changed, 13 insertions(+), 11 deletions(-)
-
-diff --git a/tools/bootconfig/main.c b/tools/bootconfig/main.c
-index 8a48cc2536f5..dce2d6ffcca5 100644
---- a/tools/bootconfig/main.c
-+++ b/tools/bootconfig/main.c
-@@ -11,6 +11,7 @@
- #include <string.h>
- #include <errno.h>
- #include <endian.h>
-+#include <assert.h>
- #include <linux/bootconfig.h>
-@@ -359,7 +360,12 @@ static int delete_xbc(const char *path)
- static int apply_xbc(const char *path, const char *xbc_path)
- {
--      char *buf, *data, *p;
-+      struct {
-+              uint32_t size;
-+              uint32_t csum;
-+              char magic[BOOTCONFIG_MAGIC_LEN];
-+      } footer;
-+      char *buf, *data;
-       size_t total_size;
-       struct stat stat;
-       const char *msg;
-@@ -430,17 +436,13 @@ static int apply_xbc(const char *path, const char *xbc_path)
-       size += pad;
-       /* Add a footer */
--      p = data + size;
--      *(uint32_t *)p = htole32(size);
--      p += sizeof(uint32_t);
-+      footer.size = htole32(size);
-+      footer.csum = htole32(csum);
-+      memcpy(footer.magic, BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_LEN);
-+      static_assert(sizeof(footer) == BOOTCONFIG_FOOTER_SIZE);
-+      memcpy(data + size, &footer, BOOTCONFIG_FOOTER_SIZE);
--      *(uint32_t *)p = htole32(csum);
--      p += sizeof(uint32_t);
--
--      memcpy(p, BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_LEN);
--      p += BOOTCONFIG_MAGIC_LEN;
--
--      total_size = p - data;
-+      total_size = size + BOOTCONFIG_FOOTER_SIZE;
-       ret = write(fd, data, total_size);
-       if (ret < total_size) {
--- 
-2.39.5
-
index e96ee69f3d416ce71da0dd43227bd65eef59a572..a5b8652f05c6d139ea79cd5503f4b972b9b28068 100644 (file)
@@ -137,7 +137,6 @@ iio-adc-ad7768-1-ensure-sync_in-pulse-minimum-timing.patch
 asoc-codecs-rt5640-retry-device_id-verification.patch
 asoc-qcom-use-drvdata-instead-of-component-to-keep-i.patch
 powerpc-thp-tracing-hide-hugepage-events-under-confi.patch
-bootconfig-fix-unaligned-access-when-building-footer.patch
 bluetooth-hci_sock-reset-cookie-to-zero-in-hci_sock_.patch
 xen-netfront-fix-tx-response-spurious-interrupts.patch
 net-usb-cdc-ncm-check-for-filtering-capability.patch