From afea0c0b6ed5d08055d6ccfcc270c58f6b45d407 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 23 Nov 2022 08:04:50 +0100 Subject: [PATCH] 5.10-stable patches added patches: uapi-linux-stddef.h-add-include-guards.patch --- queue-5.10/series | 1 + ...pi-linux-stddef.h-add-include-guards.patch | 38 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 queue-5.10/uapi-linux-stddef.h-add-include-guards.patch diff --git a/queue-5.10/series b/queue-5.10/series index f5b76aa9744..3dca5538d24 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -134,3 +134,4 @@ scsi-target-tcm_loop-fix-possible-name-leak-in-tcm_l.patch scsi-scsi_debug-fix-possible-uaf-in-sdebug_add_host_.patch kprobes-skip-clearing-aggrprobe-s-post_handler-in-kp.patch input-i8042-fix-leaking-of-platform-device-on-module.patch +uapi-linux-stddef.h-add-include-guards.patch diff --git a/queue-5.10/uapi-linux-stddef.h-add-include-guards.patch b/queue-5.10/uapi-linux-stddef.h-add-include-guards.patch new file mode 100644 index 00000000000..5f93ad729fb --- /dev/null +++ b/queue-5.10/uapi-linux-stddef.h-add-include-guards.patch @@ -0,0 +1,38 @@ +From 55037ed7bdc62151a726f5685f88afa6a82959b1 Mon Sep 17 00:00:00 2001 +From: Tadeusz Struk +Date: Tue, 29 Mar 2022 10:12:52 -0700 +Subject: uapi/linux/stddef.h: Add include guards + +From: Tadeusz Struk + +commit 55037ed7bdc62151a726f5685f88afa6a82959b1 upstream. + +Add include guard wrapper define to uapi/linux/stddef.h to prevent macro +redefinition errors when stddef.h is included more than once. This was not +needed before since the only contents already used a redefinition test. + +Signed-off-by: Tadeusz Struk +Link: https://lore.kernel.org/r/20220329171252.57279-1-tadeusz.struk@linaro.org +Fixes: 50d7bd38c3aa ("stddef: Introduce struct_group() helper macro") +Cc: stable@vger.kernel.org +Signed-off-by: Kees Cook +Signed-off-by: Greg Kroah-Hartman +--- + include/uapi/linux/stddef.h | 4 ++++ + 1 file changed, 4 insertions(+) + +--- 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 + + #ifndef __always_inline +@@ -25,3 +28,4 @@ + struct { MEMBERS } ATTRS; \ + struct TAG { MEMBERS } ATTRS NAME; \ + } ++#endif -- 2.47.3