diff options
| author |   Sam James <sam@gentoo.org> | 2023-10-06 20:41:12 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-10-06 20:41:30 +0100 |
| commit | ae36ddf9ac48b52efa7fb9010830ade6be73d659 (patch) | |
| tree | a02ac340a24b182f3f3ed647a8d3dea51084fb0d /6.5/00_all_0004-uapi-stddef.h-Fix-header-guard-location.patch | |
| parent | 6.5: new patchset, clone of 6.4 (diff) | |
| download | linux-headers-patches-ae36ddf9ac48b52efa7fb9010830ade6be73d659.tar.gz linux-headers-patches-ae36ddf9ac48b52efa7fb9010830ade6be73d659.tar.bz2 linux-headers-patches-ae36ddf9ac48b52efa7fb9010830ade6be73d659.zip | |
6.5: add patches
* 6.5/00_all_0003-Compiler-Attributes-counted_by-Adjust-name-and-ident.patch:
cc17adeef726a0df7fe5df7585a07128cd0c6070 ('Compiler Attributes: counted_by: Adjust name and identifier expansion')
* 6.5/00_all_0004-uapi-stddef.h-Fix-header-guard-location.patch:
721045f22e1a79cb04bfd4463cdf445108287666 ('uapi: stddef.h: Fix header guard location')
* 6.5/00_all_0005-uapi-stddef.h-Fix-__DECLARE_FLEX_ARRAY-for-C.patch:
144ed54ed6ec4c099ff7c2b0064ed3ff89b73737 ('uapi: stddef.h: Fix __DECLARE_FLEX_ARRAY for C++')
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to '6.5/00_all_0004-uapi-stddef.h-Fix-header-guard-location.patch')
| -rw-r--r-- | 6.5/00_all_0004-uapi-stddef.h-Fix-header-guard-location.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/6.5/00_all_0004-uapi-stddef.h-Fix-header-guard-location.patch b/6.5/00_all_0004-uapi-stddef.h-Fix-header-guard-location.patch new file mode 100644 index 0000000..74fed6e --- /dev/null +++ b/6.5/00_all_0004-uapi-stddef.h-Fix-header-guard-location.patch @@ -0,0 +1,41 @@ +From 4741f029c3eebaaaae560864d5442319ad1d7a02 Mon Sep 17 00:00:00 2001 +From: Alexey Dobriyan <adobriyan@gmail.com> +Date: Tue, 12 Sep 2023 19:23:21 +0300 +Subject: [PATCH 4/5] uapi: stddef.h: Fix header guard location + +[ Upstream commit 531108ec5b5cd45ec6272a6115e73275baef7d22 ] + +The #endif for the header guard wasn't at the end of the header. This +was harmless since the define that escaped was already testing for its +own redefinition. Regardless, move the #endif to the correct place. + +Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> +Fixes: c8248faf3ca2 ("Compiler Attributes: counted_by: Adjust name and identifier expansion") +Link: https://lore.kernel.org/r/b1f5081e-339d-421d-81b2-cbb94e1f6f5f@p183 +Co-developed-by: Kees Cook <keescook@chromium.org> +Signed-off-by: Kees Cook <keescook@chromium.org> +Stable-dep-of: 32a4ec211d41 ("uapi: stddef.h: Fix __DECLARE_FLEX_ARRAY for C++") +Signed-off-by: Sasha Levin <sashal@kernel.org> +(cherry picked from commit 721045f22e1a79cb04bfd4463cdf445108287666) +--- + include/uapi/linux/stddef.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/uapi/linux/stddef.h b/include/uapi/linux/stddef.h +index 7c3fc3980881..c027b2070d79 100644 +--- a/include/uapi/linux/stddef.h ++++ b/include/uapi/linux/stddef.h +@@ -44,8 +44,9 @@ + struct { } __empty_ ## NAME; \ + TYPE NAME[]; \ + } +-#endif + + #ifndef __counted_by + #define __counted_by(m) + #endif ++ ++#endif /* _UAPI_LINUX_STDDEF_H */ +-- +2.42.0 + |