summaryrefslogtreecommitdiff
path: root/include/linux/kconfig.h
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2018-02-22 09:41:40 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-02-22 09:43:47 -0800
commit28128c61e08eaeced9cc8ec0e6b5d677b5b94690 (patch)
tree9d27b7a5c6b1f9dd8a415a136b0ffef6e49c52e4 /include/linux/kconfig.h
parentb21ebf2fb4cde1618915a97cc773e287ff49173e (diff)
kconfig.h: Include compiler types to avoid missed struct attributes
The header files for some structures could get included in such a way that struct attributes (specifically __randomize_layout from path.h) would be parsed as variable names instead of attributes. This could lead to some instances of a structure being unrandomized, causing nasty GPFs, etc. This patch makes sure the compiler_types.h header is included in kconfig.h so that we've always got types and struct attributes defined, since kconfig.h is included from the compiler command line. Reported-by: Patrick McLean <chutzpah@gentoo.org> Root-caused-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name> Suggested-by: Linus Torvalds <torvalds@linux-foundation.org> Tested-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name> Fixes: 3859a271a003 ("randstruct: Mark various structs for randomization") Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/kconfig.h')
-rw-r--r--include/linux/kconfig.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/kconfig.h b/include/linux/kconfig.h
index fec5076eda91..c5fd4ee776ba 100644
--- a/include/linux/kconfig.h
+++ b/include/linux/kconfig.h
@@ -64,4 +64,7 @@
*/
#define IS_ENABLED(option) __or(IS_BUILTIN(option), IS_MODULE(option))
+/* Make sure we always have all types and struct attributes defined. */
+#include <linux/compiler_types.h>
+
#endif /* __LINUX_KCONFIG_H */