* [PATCH] netfilter: bridge: define INT_MIN & INT_MAX in userspace
@ 2018-10-24 11:54 Jiri Slaby
2018-10-24 19:17 ` Máté Eckl
2018-10-25 8:25 ` Pablo Neira Ayuso
0 siblings, 2 replies; 3+ messages in thread
From: Jiri Slaby @ 2018-10-24 11:54 UTC (permalink / raw)
To: pablo
Cc: kadlec, fw, netfilter-devel, coreteam, linux-kernel, Jiri Slaby,
Máté Eckl
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 <jslaby@suse.cz>
Cc: Máté Eckl <ecklm94@gmail.com>
Cc: Pablo Neira Ayuso <pablo@netfilter.org>
---
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 <linux/if_vlan.h>
#include <linux/if_pppox.h>
+#ifndef __KERNEL__
+#include <limits.h> /* for INT_MIN, INT_MAX */
+#endif
+
/* Bridge Hooks */
/* After promisc drops, checksum checks. */
#define NF_BR_PRE_ROUTING 0
--
2.19.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] netfilter: bridge: define INT_MIN & INT_MAX in userspace
2018-10-24 11:54 [PATCH] netfilter: bridge: define INT_MIN & INT_MAX in userspace Jiri Slaby
@ 2018-10-24 19:17 ` Máté Eckl
2018-10-25 8:25 ` Pablo Neira Ayuso
1 sibling, 0 replies; 3+ messages in thread
From: Máté Eckl @ 2018-10-24 19:17 UTC (permalink / raw)
To: Jiri Slaby; +Cc: pablo, kadlec, fw, netfilter-devel, coreteam, linux-kernel
On Wed, Oct 24, 2018 at 01:54:03PM +0200, Jiri Slaby wrote:
> 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).
Indeed I didn't think of this solution.
Thanks for the fix Jiri!
>
> Fixes: 94276fa8a2a4 ("netfilter: bridge: Expose nf_tables bridge hook priorities through uapi")
> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> Cc: Máté Eckl <ecklm94@gmail.com>
> Cc: Pablo Neira Ayuso <pablo@netfilter.org>
Acked-by: Máté Eckl <ecklm94@gmail.com>
> ---
> 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 <linux/if_vlan.h>
> #include <linux/if_pppox.h>
>
> +#ifndef __KERNEL__
> +#include <limits.h> /* for INT_MIN, INT_MAX */
> +#endif
> +
> /* Bridge Hooks */
> /* After promisc drops, checksum checks. */
> #define NF_BR_PRE_ROUTING 0
> --
> 2.19.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] netfilter: bridge: define INT_MIN & INT_MAX in userspace
2018-10-24 11:54 [PATCH] netfilter: bridge: define INT_MIN & INT_MAX in userspace Jiri Slaby
2018-10-24 19:17 ` Máté Eckl
@ 2018-10-25 8:25 ` Pablo Neira Ayuso
1 sibling, 0 replies; 3+ messages in thread
From: Pablo Neira Ayuso @ 2018-10-25 8:25 UTC (permalink / raw)
To: Jiri Slaby
Cc: kadlec, fw, netfilter-devel, coreteam, linux-kernel, Máté Eckl
On Wed, Oct 24, 2018 at 01:54:03PM +0200, Jiri Slaby wrote:
> 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).
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-10-25 8:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-24 11:54 [PATCH] netfilter: bridge: define INT_MIN & INT_MAX in userspace Jiri Slaby
2018-10-24 19:17 ` Máté Eckl
2018-10-25 8:25 ` Pablo Neira Ayuso
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.