netfilter: add DEBUG_NET_WARN_ON_ONCE to skb_set_nfct()
Subsystems (6)
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: add DEBUG_NET_WARN_ON_ONCE to skb_set_nfct()
Trigger a warning if nf_ct_set() overlaps an existing ct object leading to refcount leak. Add this warning to skb_set_nfct() whose only user is nf_ct_set() instead.
Update existing nf_ct_set() callsites to use nf_reset_ct() first to clean up stale pointer to conntrack object which migh trigger false positive warnings.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- include/linux/skbuff.h | 1 + include/net/ip_vs.h | 2 +- net/openvswitch/conntrack.c | 2 +- net/sched/act_ct.c | 6 +++--- 4 files changed, 6 insertions(+), 5 deletions(-)
include/linux/skbuff.h +1 -0
@@ -5004,6 +5004,7 @@ static inline unsigned long skb_get_nfct(const struct sk_buff *skb)static inline void skb_set_nfct (struct sk_buff *skb,unsigned long nfct) {#if IS_ENABLED (CONFIG_NF_CONNTRACK ) +DEBUG_NET_WARN_ON_ONCE (skb->_nfct &NFCT_PTRMASK ); skb->slow_gro |= !!nfct; skb->_nfct = nfct;#endif
include/net/ip_vs.h +1 -1
@@ -2130,7 +2130,7 @@ static inline void ip_vs_notrack(struct sk_buff *skb)struct nf_conn *ct =nf_ct_get (skb, &ctinfo);if (ct) { -nf_conntrack_put (&ct->ct_general); +nf_reset_ct (skb);nf_ct_set (skb,NULL ,IP_CT_UNTRACKED ); }#endif
net/openvswitch/conntrack.c +1 -1
@@ -603,7 +603,7 @@ static bool skb_nfct_cached(struct net *net,if (nf_ct_is_confirmed (ct))nf_ct_delete (ct,0 ,0 ); -nf_ct_put (ct); +nf_reset_ct (skb);nf_ct_set (skb,NULL ,0 );return false; }
net/sched/act_ct.c +3 -3
@@ -782,7 +782,7 @@ static bool tcf_ct_skb_nfct_cached(struct net *net, struct sk_buff *skb,return true; drop_ct: -nf_ct_put (ct); +nf_reset_ct (skb);nf_ct_set (skb,NULL ,IP_CT_UNTRACKED );return false;
@@ -996,7 +996,7 @@ TC_INDIRECT_SCOPE int tcf_ct_act(struct sk_buff *skb, const struct tc_action *a,qdisc_skb_cb (skb)->post_ct = false; ct =nf_ct_get (skb, &ctinfo);if (ct) { -nf_ct_put (ct); +nf_reset_ct (skb);nf_ct_set (skb,NULL ,IP_CT_UNTRACKED ); }
@@ -1034,7 +1034,7 @@ TC_INDIRECT_SCOPE int tcf_ct_act(struct sk_buff *skb, const struct tc_action *a,/* Associate skb with specified zone. */ if (tmpl) { -nf_conntrack_put (skb_nfct (skb)); +nf_reset_ct (skb);nf_conntrack_get (&tmpl->ct_general);nf_ct_set (skb, tmpl,IP_CT_NEW ); }
Signature · 1 line
2.47.3