linux-kernel - [PATCH 4.2.y-ckt 204/206] uapi glibc compat: fix compilation when !__USE

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <1465507015-23052-205-git-send-email-kamal@canonical.com>
Date:	Thu,  9 Jun 2016 14:16:53 -0700
From:	Kamal Mostafa <kamal@...onical.com>
To:	linux-kernel@...r.kernel.org, stable@...r.kernel.org,
	kernel-team@...ts.ubuntu.com
Cc:	Jan Engelhardt <jengelh@...i.de>,
	Josh Boyer <jwboyer@...oraproject.org>,
	Stephen Hemminger <shemming@...cade.com>,
	Waldemar Brodkorb <mail@...demar-brodkorb.de>,
	Gabriel Laskar <gabriel@....epita.fr>,
	Mikko Rapeli <mikko.rapeli@....fi>,
	Nicolas Dichtel <nicolas.dichtel@...nd.com>,
	"David S . Miller" <davem@...emloft.net>,
	Kamal Mostafa <kamal@...onical.com>
Subject: [PATCH 4.2.y-ckt 204/206] uapi glibc compat: fix compilation when !__USE_MISC in glibc

4.2.8-ckt12 -stable review patch.  If anyone has any objections, please let me know.

---8<------------------------------------------------------------

From: Nicolas Dichtel <nicolas.dichtel@...nd.com>

commit f0a3fdca794d1e68ae284ef4caefe681f7c18e89 upstream.

These structures are defined only if __USE_MISC is set in glibc net/if.h
headers, ie when _BSD_SOURCE or _SVID_SOURCE are defined.

CC: Jan Engelhardt <jengelh@...i.de>
CC: Josh Boyer <jwboyer@...oraproject.org>
CC: Stephen Hemminger <shemming@...cade.com>
CC: Waldemar Brodkorb <mail@...demar-brodkorb.de>
CC: Gabriel Laskar <gabriel@....epita.fr>
CC: Mikko Rapeli <mikko.rapeli@....fi>
Fixes: 4a91cb61bb99 ("uapi glibc compat: fix compile errors when glibc net/if.h included before linux/if.h")
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@...nd.com>
Signed-off-by: David S. Miller <davem@...emloft.net>
Signed-off-by: Kamal Mostafa <kamal@...onical.com>
---
 include/uapi/linux/libc-compat.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h
index d5e38c7..e4f048e 100644
--- a/include/uapi/linux/libc-compat.h
+++ b/include/uapi/linux/libc-compat.h
@@ -52,7 +52,7 @@
 #if defined(__GLIBC__)
 
 /* Coordinate with glibc net/if.h header. */
-#if defined(_NET_IF_H)
+#if defined(_NET_IF_H) && defined(__USE_MISC)
 
 /* GLIBC headers included first so don't define anything
  * that would already be defined. */
-- 
2.7.4