diff options
| author | Kees Cook <keescook@chromium.org> | 2017-02-21 21:12:57 -0800 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2017-02-21 21:12:57 -0800 |
| commit | c054ee3bbf69ebcabb1f3218b7faf4b1b37a8eb6 (patch) | |
| tree | e37110acf18ab5139e589576856c6e1611bfd6b3 /include | |
| parent | e7e04c0c8c7ea931d966e5bd349a0b1c836b1ebf (diff) | |
| parent | c61f13eaa1ee17728c41370100d2d45c254ce76f (diff) | |
| download | linux-c054ee3bbf69ebcabb1f3218b7faf4b1b37a8eb6.tar.bz2 | |
Merge branch 'for-next/gcc-plugin/structleak' into for-linus/gcc-plugins
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/compiler.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/compiler.h b/include/linux/compiler.h index cf0fa5d86059..91c30cba984e 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -27,7 +27,11 @@ extern void __chk_user_ptr(const volatile void __user *); extern void __chk_io_ptr(const volatile void __iomem *); # define ACCESS_PRIVATE(p, member) (*((typeof((p)->member) __force *) &(p)->member)) #else /* __CHECKER__ */ -# define __user +# ifdef STRUCTLEAK_PLUGIN +# define __user __attribute__((user)) +# else +# define __user +# endif # define __kernel # define __safe # define __force |