forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xattr: guard against simultaneous glibc header inclusion

Browse source 
If the glibc xattr.h header is included after the uapi header,
compilation fails due to an enum re-using a #define from the uapi
header.

Protect against this by guarding the define and enum inclusions against
each other.

(See https://lists.debian.org/debian-glibc/2014/03/msg00029.html
and https://sourceware.org/glibc/wiki/Synchronizing_Headers
for more information.)

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Allan McRae <allan@archlinux.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Serge Hallyn 2014-04-03 14:48:33 -07:00 • committed by Linus Torvalds
commit ea1a8217b0
2 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/uapi/linux/libc-compat.h
View file

@ -85,6 +85,12 @@
#endif /* _NETINET_IN_H */ #endif /* _NETINET_IN_H */
/* Definitions for xattr.h */
#if defined(_SYS_XATTR_H)
#define __UAPI_DEF_XATTR 0
#else
#define __UAPI_DEF_XATTR 1
#endif
/* If we did not see any headers from any supported C libraries, /* If we did not see any headers from any supported C libraries,
* or we are being included in the kernel, then define everything * or we are being included in the kernel, then define everything
@ -98,6 +104,9 @@
#define __UAPI_DEF_IPV6_MREQ 1 #define __UAPI_DEF_IPV6_MREQ 1
#define __UAPI_DEF_IPPROTO_V6 1 #define __UAPI_DEF_IPPROTO_V6 1
/* Definitions for xattr.h */
#define __UAPI_DEF_XATTR 1
#endif /* __GLIBC__ */ #endif /* __GLIBC__ */
#endif /* _UAPI_LIBC_COMPAT_H */ #endif /* _UAPI_LIBC_COMPAT_H */

7
include/uapi/linux/xattr.h
View file

@ -7,11 +7,18 @@
Copyright (c) 2001-2002 Silicon Graphics, Inc. All Rights Reserved. Copyright (c) 2001-2002 Silicon Graphics, Inc. All Rights Reserved.
Copyright (c) 2004 Red Hat, Inc., James Morris <jmorris@redhat.com> Copyright (c) 2004 Red Hat, Inc., James Morris <jmorris@redhat.com>
*/ */
#include <linux/libc-compat.h>
#ifndef _UAPI_LINUX_XATTR_H #ifndef _UAPI_LINUX_XATTR_H
#define _UAPI_LINUX_XATTR_H #define _UAPI_LINUX_XATTR_H
#ifdef __UAPI_DEF_XATTR
#define __USE_KERNEL_XATTR_DEFS
#define XATTR_CREATE 0x1 /* set value, fail if attr already exists */ #define XATTR_CREATE 0x1 /* set value, fail if attr already exists */
#define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */ #define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */
#endif
/* Namespaces */ /* Namespaces */
#define XATTR_OS2_PREFIX "os2." #define XATTR_OS2_PREFIX "os2."