diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-04-13 02:29:40 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-04-13 02:29:40 +0200 |
commit | a19944809fe9942e6a96292490717904d0690c21 (patch) | |
tree | 5c66e3e001af8969efd1f95ed6ee90b1afa278b7 /include | |
parent | Merge tag 'nfsd-5.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/... (diff) | |
parent | gcc-plugins: latent_entropy: use /dev/urandom (diff) | |
download | linux-a19944809fe9942e6a96292490717904d0690c21.tar.xz linux-a19944809fe9942e6a96292490717904d0690c21.zip |
Merge tag 'hardening-v5.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull hardening fixes from Kees Cook:
- latent_entropy: Use /dev/urandom instead of small GCC seed (Jason
Donenfeld)
- uapi/stddef.h: add missed include guards (Tadeusz Struk)
* tag 'hardening-v5.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
gcc-plugins: latent_entropy: use /dev/urandom
uapi/linux/stddef.h: Add include guards
Diffstat (limited to 'include')
-rw-r--r-- | include/uapi/linux/stddef.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/uapi/linux/stddef.h b/include/uapi/linux/stddef.h index 3021ea25a284..7837ba4fe728 100644 --- a/include/uapi/linux/stddef.h +++ b/include/uapi/linux/stddef.h @@ -1,4 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +#ifndef _UAPI_LINUX_STDDEF_H +#define _UAPI_LINUX_STDDEF_H + #include <linux/compiler_types.h> #ifndef __always_inline @@ -41,3 +44,4 @@ struct { } __empty_ ## NAME; \ TYPE NAME[]; \ } +#endif |