lkml.org 
[lkml]   [2018]   [Nov]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 034/118] netfilter: bridge: define INT_MIN & INT_MAX in userspace
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ 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 <jslaby@suse.cz>
    Acked-by: Máté Eckl <ecklm94@gmail.com>
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
    Signed-off-by: Sasha Levin <sashal@kernel.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.17.1


    \
     
     \ /
      Last update: 2018-11-26 12:12    [W:3.859 / U:0.568 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site