Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

uapi/if_ether.h: move __UAPI_DEF_ETHHDR libc define

This fixes a compile problem of some user space applications by not
including linux/libc-compat.h in uapi/if_ether.h.

linux/libc-compat.h checks which "features" the header files, included
from the libc, provide to make the Linux kernel uapi header files only
provide no conflicting structures and enums. If a user application mixes
kernel headers and libc headers it could happen that linux/libc-compat.h
gets included too early where not all other libc headers are included
yet. Then the linux/libc-compat.h would not prevent all the
redefinitions and we run into compile problems.
This patch removes the include of linux/libc-compat.h from
uapi/if_ether.h to fix the recently introduced case, but not all as this
is more or less impossible.

It is no problem to do the check directly in the if_ether.h file and not
in libc-compat.h as this does not need any fancy glibc header detection
as glibc never provided struct ethhdr and should define
__UAPI_DEF_ETHHDR by them self when they will provide this.

The following test program did not compile correctly any more:

#include <linux/if_ether.h>
#include <netinet/in.h>
#include <linux/in.h>

int main(void)
{
return 0;
}

Fixes: 6926e041a892 ("uapi/if_ether.h: prevent redefinition of struct ethhdr")
Reported-by: Guillaume Nault <g.nault@alphalink.fr>
Cc: <stable@vger.kernel.org> # 4.15
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Hauke Mehrtens and committed by
David S. Miller
da360299 07a2e1cf

+5 -7
+5 -1
include/uapi/linux/if_ether.h
··· 23 23 #define _UAPI_LINUX_IF_ETHER_H 24 24 25 25 #include <linux/types.h> 26 - #include <linux/libc-compat.h> 27 26 28 27 /* 29 28 * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble ··· 149 150 /* 150 151 * This is an Ethernet frame header. 151 152 */ 153 + 154 + /* allow libcs like musl to deactivate this, glibc does not implement this. */ 155 + #ifndef __UAPI_DEF_ETHHDR 156 + #define __UAPI_DEF_ETHHDR 1 157 + #endif 152 158 153 159 #if __UAPI_DEF_ETHHDR 154 160 struct ethhdr {
-6
include/uapi/linux/libc-compat.h
··· 264 264 265 265 #endif /* __GLIBC__ */ 266 266 267 - /* Definitions for if_ether.h */ 268 - /* allow libcs like musl to deactivate this, glibc does not implement this. */ 269 - #ifndef __UAPI_DEF_ETHHDR 270 - #define __UAPI_DEF_ETHHDR 1 271 - #endif 272 - 273 267 #endif /* _UAPI_LIBC_COMPAT_H */