5.10-stable patches

added patches:
	uapi-linux-stddef.h-add-include-guards.patch

diff --git a/queue-5.10/series b/queue-5.10/series
index f5b76aa974417acf233ba11e2b3dff0fa1f3182d..3dca5538d24d820cd583fed01edc538bcae31eee 100644 (file)
--- 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 (file)
index 0000000..5f93ad7
--- /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 <tadeusz.struk@linaro.org>
+Date: Tue, 29 Mar 2022 10:12:52 -0700
+Subject: uapi/linux/stddef.h: Add include guards
+
+From: Tadeusz Struk <tadeusz.struk@linaro.org>
+
+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 <tadeusz.struk@linaro.org>
+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 <keescook@chromium.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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 <linux/compiler_types.h>
+ 
+ #ifndef __always_inline
+@@ -25,3 +28,4 @@
+               struct { MEMBERS } ATTRS; \
+               struct TAG { MEMBERS } ATTRS NAME; \
+       }
++#endif