From 47105aa93b404cc6538e45413ba8ad47b755b932 Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Thu, 4 Jan 2018 14:16:47 +0100 Subject: Backport patch: netfilter: ipset: use nfnl_mutex_is_locked --- configure.ac | 10 ++++++++++ kernel/include/linux/netfilter/ipset/ip_set_compat.h.in | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/configure.ac b/configure.ac index 9b6c907..9b6d605 100644 --- a/configure.ac +++ b/configure.ac @@ -599,6 +599,16 @@ else AC_SUBST(HAVE_TIMER_SETUP, undef) fi +AC_MSG_CHECKING([kernel source for lockdep_nfnl_is_held() in nfnetlink.h]) +if test -f $ksourcedir/include/linux/netfilter/nfnetlink.h && \ + $GREP -q ' lockdep_nfnl_is_held' $ksourcedir/include/linux/netfilter/nfnetlink.h; then + AC_MSG_RESULT(yes) + AC_SUBST(HAVE_LOCKDEP_NFNL_IS_HELD, define) +else + AC_MSG_RESULT(no) + AC_SUBST(HAVE_LOCKDEP_NFNL_IS_HELD, undef) +fi + AC_MSG_CHECKING([kernel source for struct net_generic]) if test -f $ksourcedir/include/net/netns/generic.h && \ $GREP -q 'struct net_generic' $ksourcedir/include/net/netns/generic.h; then diff --git a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in index e1caa68..c78867d 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in +++ b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in @@ -44,6 +44,7 @@ #@HAVE_PASSING_EXTENDED_ACK_TO_CALLBACKS@ HAVE_PASSING_EXTENDED_ACK_TO_CALLBACKS #@HAVE_TYPEDEF_SCTP_SCTPHDR_T@ HAVE_TYPEDEF_SCTP_SCTPHDR_T #@HAVE_TIMER_SETUP@ HAVE_TIMER_SETUP +#@HAVE_LOCKDEP_NFNL_IS_HELD@ HAVE_LOCKDEP_NFNL_IS_HELD #ifdef HAVE_EXPORT_SYMBOL_GPL_IN_MODULE_H #include @@ -193,6 +194,10 @@ static inline int nla_put_net64(struct sk_buff *skb, int attrtype, __be64 value) #define nfnl_unlock(x) nfnl_unlock() #endif +#ifndef HAVE_LOCKDEP_NFNL_IS_HELD +#define lockdep_nfnl_is_held(x) 1 +#endif + #if HAVE_IPV6_SKIP_EXTHDR_ARGS == 3 #define ipv6_skip_exthdr(skbuff, start, nexthdrp, frag_offp) \ ipv6_skip_exthdr(skbuff, start, nexthdrp) -- cgit v1.2.1