[PATCH AUTOSEL 4.19 03/73] netfilter: bridge: define INT_MIN & INT_MAX in userspace
From: Jiri Slaby
[ Upstream commit 5a8de47b3c250521dd632cdedaac6db88367defa ]
With 4.19, programs like ebtables fail to build when they include
"linux/netfilter_bridge.h". It is caused by commit 94276fa8a2a4 which
added a use of INT_MIN and INT_MAX to the header:
: In file included from /usr/include/linux/netfilter_bridge/ebtables.h:18,
: from include/ebtables_u.h:28,
: from communication.c:23:
: /usr/include/linux/netfilter_bridge.h:30:20: error: 'INT_MIN' undeclared here
(not in a function)
: NF_BR_PRI_FIRST = INT_MIN,
: ^~~
Define these constants by including "limits.h" when !__KERNEL__ (the
same way as for other netfilter_* headers).
Fixes: 94276fa8a2a4 ("netfilter: bridge: Expose nf_tables bridge hook
priorities through uapi")
Signed-off-by: Jiri Slaby
Acked-by: Máté Eckl
Signed-off-by: Pablo Neira Ayuso
Signed-off-by: Sasha Levin
---
include/uapi/linux/netfilter_bridge.h | 4
1 file changed, 4 insertions(+)
diff --git a/include/uapi/linux/netfilter_bridge.h
b/include/uapi/linux/netfilter_bridge.h
index 156ccd089df1..1610fdbab98d 100644
--- a/include/uapi/linux/netfilter_bridge.h
+++ b/include/uapi/linux/netfilter_bridge.h
@@ -11,6 +11,10 @@
#include
#include
+#ifndef __KERNEL__
+#include /* for INT_MIN, INT_MAX */
+#endif
+
/* Bridge Hooks */
/* After promisc drops, checksum checks. */
#define NF_BR_PRE_ROUTING 0
--
2.17.1
[PATCH AUTOSEL 4.19 03/73] netfilter: bridge: define INT_MIN & INT_MAX in userspace
From: Jiri Slaby
[ Upstream commit 5a8de47b3c250521dd632cdedaac6db88367defa ]
With 4.19, programs like ebtables fail to build when they include
"linux/netfilter_bridge.h". It is caused by commit 94276fa8a2a4 which
added a use of INT_MIN and INT_MAX to the header:
: In file included from /usr/include/linux/netfilter_bridge/ebtables.h:18,
: from include/ebtables_u.h:28,
: from communication.c:23:
: /usr/include/linux/netfilter_bridge.h:30:20: error: 'INT_MIN' undeclared here
(not in a function)
: NF_BR_PRI_FIRST = INT_MIN,
: ^~~
Define these constants by including "limits.h" when !__KERNEL__ (the
same way as for other netfilter_* headers).
Fixes: 94276fa8a2a4 ("netfilter: bridge: Expose nf_tables bridge hook
priorities through uapi")
Signed-off-by: Jiri Slaby
Acked-by: Máté Eckl
Signed-off-by: Pablo Neira Ayuso
Signed-off-by: Sasha Levin
---
include/uapi/linux/netfilter_bridge.h | 4
1 file changed, 4 insertions(+)
diff --git a/include/uapi/linux/netfilter_bridge.h
b/include/uapi/linux/netfilter_bridge.h
index 156ccd089df1..1610fdbab98d 100644
--- a/include/uapi/linux/netfilter_bridge.h
+++ b/include/uapi/linux/netfilter_bridge.h
@@ -11,6 +11,10 @@
#include
#include
+#ifndef __KERNEL__
+#include /* for INT_MIN, INT_MAX */
+#endif
+
/* Bridge Hooks */
/* After promisc drops, checksum checks. */
#define NF_BR_PRE_ROUTING 0
--
2.17.1
