Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'hardening-v6.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull hardening fixes from Kees Cook:
- Fix UAPI stddef.h to avoid C++-ism (Alexey Dobriyan)
- Fix harmless UAPI stddef.h header guard endif (Alexey Dobriyan)
* tag 'hardening-v6.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
uapi: stddef.h: Fix __DECLARE_FLEX_ARRAY for C++
uapi: stddef.h: Fix header guard location
+7
+7
include/uapi/linux/stddef.h
+7
include/uapi/linux/stddef.h
···
29
29
struct TAG { MEMBERS } ATTRS NAME; \
30
30
}
31
31
32
+
#ifdef __cplusplus
33
+
/* sizeof(struct{}) is 1 in C++, not 0, can't use C version of the macro. */
34
+
#define __DECLARE_FLEX_ARRAY(T, member) \
35
+
T member[0]
36
+
#else
32
37
/**
33
38
* __DECLARE_FLEX_ARRAY() - Declare a flexible array usable in a union
34
39
*
···
54
49
#ifndef __counted_by
55
50
#define __counted_by(m)
56
51
#endif
52
+
53
+
#endif /* _UAPI_LINUX_STDDEF_H */