Fixes for all trees

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.1/revert-x86-kexec-add-a-sanity-check-on-previous-kern.patch b/queue-6.1/revert-x86-kexec-add-a-sanity-check-on-previous-kern.patch
new file mode 100644 (file)
index 0000000..14bc360
--- /dev/null
+++ b/queue-6.1/revert-x86-kexec-add-a-sanity-check-on-previous-kern.patch
@@ -0,0 +1,41 @@
+From 0ae716c6d1396f62f6012a1c1f2852533df973ea Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 5 Mar 2026 09:48:33 -0500
+Subject: Revert "x86/kexec: add a sanity check on previous kernel's ima kexec
+ buffer"
+
+This reverts commit c5489d04337b47e93c0623e8145fcba3f5739efd.
+
+The commit introduces a call to ima_validate_range() in
+arch/x86/kernel/setup.c, but the function declaration is not available
+in the 6.12 stable tree, resulting in build failures due to implicit
+function declaration errors across multiple stable branches.
+
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/x86/kernel/setup.c | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
+index 38f48875df91a..18a034613d94d 100644
+--- a/arch/x86/kernel/setup.c
++++ b/arch/x86/kernel/setup.c
+@@ -377,15 +377,9 @@ int __init ima_free_kexec_buffer(void)
+ 
+ int __init ima_get_kexec_buffer(void **addr, size_t *size)
+ {
+-      int ret;
+-
+       if (!ima_kexec_buffer_size)
+               return -ENOENT;
+ 
+-      ret = ima_validate_range(ima_kexec_buffer_phys, ima_kexec_buffer_size);
+-      if (ret)
+-              return ret;
+-
+       *addr = __va(ima_kexec_buffer_phys);
+       *size = ima_kexec_buffer_size;
+ 
+-- 
+2.51.0
+

diff --git a/queue-6.1/series b/queue-6.1/series
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..47e1a052da8c677a59c671f45375b400821c1016 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -0,0 +1 @@
+revert-x86-kexec-add-a-sanity-check-on-previous-kern.patch

diff --git a/queue-6.12/revert-x86-kexec-add-a-sanity-check-on-previous-kern.patch b/queue-6.12/revert-x86-kexec-add-a-sanity-check-on-previous-kern.patch
new file mode 100644 (file)
index 0000000..3376668
--- /dev/null
+++ b/queue-6.12/revert-x86-kexec-add-a-sanity-check-on-previous-kern.patch
@@ -0,0 +1,41 @@
+From 412c9b54585cd7f0e4f43e17d9b4256b7c0b6dab Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 5 Mar 2026 09:48:33 -0500
+Subject: Revert "x86/kexec: add a sanity check on previous kernel's ima kexec
+ buffer"
+
+This reverts commit c5489d04337b47e93c0623e8145fcba3f5739efd.
+
+The commit introduces a call to ima_validate_range() in
+arch/x86/kernel/setup.c, but the function declaration is not available
+in the 6.12 stable tree, resulting in build failures due to implicit
+function declaration errors across multiple stable branches.
+
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/x86/kernel/setup.c | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
+index 234c4d9e50b8f..f1fea506e20f4 100644
+--- a/arch/x86/kernel/setup.c
++++ b/arch/x86/kernel/setup.c
+@@ -372,15 +372,9 @@ int __init ima_free_kexec_buffer(void)
+ 
+ int __init ima_get_kexec_buffer(void **addr, size_t *size)
+ {
+-      int ret;
+-
+       if (!ima_kexec_buffer_size)
+               return -ENOENT;
+ 
+-      ret = ima_validate_range(ima_kexec_buffer_phys, ima_kexec_buffer_size);
+-      if (ret)
+-              return ret;
+-
+       *addr = __va(ima_kexec_buffer_phys);
+       *size = ima_kexec_buffer_size;
+ 
+-- 
+2.51.0
+

diff --git a/queue-6.12/series b/queue-6.12/series
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..47e1a052da8c677a59c671f45375b400821c1016 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -0,0 +1 @@
+revert-x86-kexec-add-a-sanity-check-on-previous-kern.patch

diff --git a/queue-6.6/revert-x86-kexec-add-a-sanity-check-on-previous-kern.patch b/queue-6.6/revert-x86-kexec-add-a-sanity-check-on-previous-kern.patch
new file mode 100644 (file)
index 0000000..aaab36a
--- /dev/null
+++ b/queue-6.6/revert-x86-kexec-add-a-sanity-check-on-previous-kern.patch
@@ -0,0 +1,41 @@
+From acf7c8972775a35be318744cc436bdb20b65cebe Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 5 Mar 2026 09:48:33 -0500
+Subject: Revert "x86/kexec: add a sanity check on previous kernel's ima kexec
+ buffer"
+
+This reverts commit c5489d04337b47e93c0623e8145fcba3f5739efd.
+
+The commit introduces a call to ima_validate_range() in
+arch/x86/kernel/setup.c, but the function declaration is not available
+in the 6.12 stable tree, resulting in build failures due to implicit
+function declaration errors across multiple stable branches.
+
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/x86/kernel/setup.c | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
+index df74f865c9f12..eb129277dcdd6 100644
+--- a/arch/x86/kernel/setup.c
++++ b/arch/x86/kernel/setup.c
+@@ -372,15 +372,9 @@ int __init ima_free_kexec_buffer(void)
+ 
+ int __init ima_get_kexec_buffer(void **addr, size_t *size)
+ {
+-      int ret;
+-
+       if (!ima_kexec_buffer_size)
+               return -ENOENT;
+ 
+-      ret = ima_validate_range(ima_kexec_buffer_phys, ima_kexec_buffer_size);
+-      if (ret)
+-              return ret;
+-
+       *addr = __va(ima_kexec_buffer_phys);
+       *size = ima_kexec_buffer_size;
+ 
+-- 
+2.51.0
+

diff --git a/queue-6.6/series b/queue-6.6/series
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..47e1a052da8c677a59c671f45375b400821c1016 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -0,0 +1 @@
+revert-x86-kexec-add-a-sanity-check-on-previous-kern.patch