2024-06-13 11:08:51

by Nikolay Borisov

[permalink] [raw]
Subject: [PATCH v2] x86/boot: Remove unused function __fortify_panic()

That function is only used when the kernel is compiled with
FORTIFY_SOURCE and when the kernel proper string.h header is used. The
decompressor code doesn't use the kernel proper header but has local
copy which doesn't contain any fortified implementations of the various
string functions. As such __fortify_panic() can never be called from the
decompressor so let's remove it.

Signed-off-by: Nikolay Borisov <[email protected]>
---
Since v1:
* Fixed typo in function
* Added () after __fortify_panic mention in the changelog...

arch/x86/boot/compressed/misc.c | 5 -----
1 file changed, 5 deletions(-)

diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
index b70e4a21c15f..944454306ef4 100644
--- a/arch/x86/boot/compressed/misc.c
+++ b/arch/x86/boot/compressed/misc.c
@@ -531,8 +531,3 @@ asmlinkage __visible void *extract_kernel(void *rmode, unsigned char *output)

return output + entry_offset;
}
-
-void __fortify_panic(const u8 reason, size_t avail, size_t size)
-{
- error("detected buffer overflow");
-}
--
2.34.1



Subject: [tip: x86/cleanups] x86/boot: Remove unused function __fortify_panic()

The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID: 71315037cb7d40cdb2f4fbefad31927f6e6caba5
Gitweb: https://git.kernel.org/tip/71315037cb7d40cdb2f4fbefad31927f6e6caba5
Author: Nikolay Borisov <[email protected]>
AuthorDate: Thu, 13 Jun 2024 14:08:37 +03:00
Committer: Borislav Petkov (AMD) <[email protected]>
CommitterDate: Fri, 14 Jun 2024 18:08:45 +02:00

x86/boot: Remove unused function __fortify_panic()

That function is only used when the kernel is compiled with FORTIFY_SOURCE and
when the kernel proper string.h header is used. The decompressor code doesn't
use the kernel proper header but has local copy which doesn't contain any
fortified implementations of the various string functions. As such
__fortify_panic() can never be called from the decompressor so remove it.

Signed-off-by: Nikolay Borisov <[email protected]>
Signed-off-by: Borislav Petkov (AMD) <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
arch/x86/boot/compressed/misc.c | 5 -----
1 file changed, 5 deletions(-)

diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
index b70e4a2..9444543 100644
--- a/arch/x86/boot/compressed/misc.c
+++ b/arch/x86/boot/compressed/misc.c
@@ -531,8 +531,3 @@ asmlinkage __visible void *extract_kernel(void *rmode, unsigned char *output)

return output + entry_offset;
}
-
-void __fortify_panic(const u8 reason, size_t avail, size_t size)
-{
- error("detected buffer overflow");
-}