lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 12 Apr 2017 22:31:01 +0200 From: Hauke Mehrtens <hauke@...ke-m.de> To: davem@...emloft.net, netdev@...r.kernel.org Cc: linux-kernel@...r.kernel.org, jarod@...hat.com, jogo@...nwrt.org, david.heidelberger@...t.cz, maillist-linux@...fooze.de, mikko.rapeli@....fi, dwmw2@...radead.org, Hauke Mehrtens <hauke@...ke-m.de> Subject: [PATCH resend 2/4] uapi glibc compat: fix build if libc defines IFF_ECHO musl 1.1.15 defines IFF_ECHO and the other net_device_flags options. When a user application includes linux/if.h and net/if.h the compile will fail. Activate __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO only when it is needed. This should also make this work in case glibc will add these defines. Acked-by: Mikko Rapeli <mikko.rapeli@....fi> Signed-off-by: Hauke Mehrtens <hauke@...ke-m.de> --- include/uapi/linux/libc-compat.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h index 7c1fead03c50..49a8cc3138ae 100644 --- a/include/uapi/linux/libc-compat.h +++ b/include/uapi/linux/libc-compat.h @@ -64,9 +64,11 @@ /* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0 /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ +#ifndef IFF_ECHO #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ +#endif /* IFF_ECHO */ #else /* _NET_IF_H */ -- 2.11.0
Powered by blists - more mailing lists