Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1669917

[PATCH 3/7] kexec_file: Adjust declaration of kexec_purgatory

Show all headers | View raw

Defining kexec_purgatory as a zero-length char array upsets compile
time size checking. Since this is built on a per-arch basis, define
it as an unsized char array (like is done for other similar things,
e.g. linker sections). This silences the warning generated by the future
CONFIG_FORTIFY_SOURCE, which did not like the memcmp() of a "0 byte"
array. This drops the __weak and uses an extern instead, since both
users define kexec_purgatory.

Cc: Daniel Micay <danielmicay@gmail.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
---
 kernel/kexec_file.c     | 7 -------
 kernel/kexec_internal.h | 2 ++
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
index b118735fea9d..7a147a7add2e 100644
--- a/kernel/kexec_file.c
+++ b/kernel/kexec_file.c
@@ -26,13 +26,6 @@
 #include <linux/vmalloc.h>
 #include "kexec_internal.h"
 
-/*
- * Declare these symbols weak so that if architecture provides a purgatory,
- * these will be overridden.
- */
-char __weak kexec_purgatory[0];
-size_t __weak kexec_purgatory_size = 0;
-
 static int kexec_calculate_store_digests(struct kimage *image);
 
 /* Architectures can provide this probe function */
diff --git a/kernel/kexec_internal.h b/kernel/kexec_internal.h
index 799a8a452187..50dfcb039a41 100644
--- a/kernel/kexec_internal.h
+++ b/kernel/kexec_internal.h
@@ -17,6 +17,8 @@ extern struct mutex kexec_mutex;
 #ifdef CONFIG_KEXEC_FILE
 #include <linux/purgatory.h>
 void kimage_file_post_load_cleanup(struct kimage *image);
+extern char kexec_purgatory[];
+extern size_t kexec_purgatory_size;
 #else /* CONFIG_KEXEC_FILE */
 static inline void kimage_file_post_load_cleanup(struct kimage *image) { }
 #endif /* CONFIG_KEXEC_FILE */
-- 
2.7.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/7] CONFIG_FORTIFY_SOURCE Kees Cook <keescook@chromium.org> - 2017-06-19 22:30 +0200
  [PATCH 3/7] kexec_file: Adjust declaration of kexec_purgatory Kees Cook <keescook@chromium.org> - 2017-06-19 22:30 +0200
  [PATCH 5/7] powerpc: Don't fortify prom_init Kees Cook <keescook@chromium.org> - 2017-06-19 22:30 +0200
  [PATCH 1/7] efi: Avoid fortify checks in EFI stub Kees Cook <keescook@chromium.org> - 2017-06-19 22:30 +0200
  Re: [PATCH 0/7] CONFIG_FORTIFY_SOURCE Andrew Morton <akpm@linux-foundation.org> - 2017-06-20 00:00 +0200
    Re: [PATCH 0/7] CONFIG_FORTIFY_SOURCE Kees Cook <keescook@chromium.org> - 2017-06-20 00:20 +0200
      Re: [PATCH 0/7] CONFIG_FORTIFY_SOURCE Andrew Morton <akpm@linux-foundation.org> - 2017-06-20 00:40 +0200

csiph-web