summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-07-04 21:40:47 -0700
committerKees Cook <keescook@chromium.org>2017-07-04 21:40:47 -0700
commit03232e0ddebdc2c9d088e6748075704885f039a5 (patch)
treea17a88fcce22279efa33f926a50651e2139f7790
parentffa47aa678cfaa9b88e8a26cfb115b4768325121 (diff)
parentf136e090c73ed2ed568dcd013c8e51ed4693a279 (diff)
Merge branch 'for-next/gcc-plugin-infrastructure' into merge/randstruct
-rw-r--r--arch/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/Kconfig b/arch/Kconfig
index 810bf206f221..3eac97a4c7b3 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -425,7 +425,7 @@ config GCC_PLUGIN_STRUCTLEAK
bool "Force initialization of variables containing userspace addresses"
depends on GCC_PLUGINS
help
- This plugin zero-initializes any structures that containing a
+ This plugin zero-initializes any structures containing a
__user attribute. This can prevent some classes of information
exposures.