Commit f02e7dc4 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso

netfilter: flowtable: prefer refcount_inc

With refcount_inc_not_zero, we'd also need a smp_rmb or similar,
followed by a test of the CONFIRMED bit.

However, the ct pointer is taken from skb->_nfct, its refcount must
not be 0 (else, we'd already have a use-after-free bug).

Use refcount_inc() instead to clarify the ct refcount is expected to
be at least 1.
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 5787db7c
...@@ -53,14 +53,14 @@ struct flow_offload *flow_offload_alloc(struct nf_conn *ct) ...@@ -53,14 +53,14 @@ struct flow_offload *flow_offload_alloc(struct nf_conn *ct)
{ {
struct flow_offload *flow; struct flow_offload *flow;
if (unlikely(nf_ct_is_dying(ct) || if (unlikely(nf_ct_is_dying(ct)))
!refcount_inc_not_zero(&ct->ct_general.use)))
return NULL; return NULL;
flow = kzalloc(sizeof(*flow), GFP_ATOMIC); flow = kzalloc(sizeof(*flow), GFP_ATOMIC);
if (!flow) if (!flow)
goto err_ct_refcnt; return NULL;
refcount_inc(&ct->ct_general.use);
flow->ct = ct; flow->ct = ct;
flow_offload_fill_dir(flow, FLOW_OFFLOAD_DIR_ORIGINAL); flow_offload_fill_dir(flow, FLOW_OFFLOAD_DIR_ORIGINAL);
...@@ -72,11 +72,6 @@ struct flow_offload *flow_offload_alloc(struct nf_conn *ct) ...@@ -72,11 +72,6 @@ struct flow_offload *flow_offload_alloc(struct nf_conn *ct)
__set_bit(NF_FLOW_DNAT, &flow->flags); __set_bit(NF_FLOW_DNAT, &flow->flags);
return flow; return flow;
err_ct_refcnt:
nf_ct_put(ct);
return NULL;
} }
EXPORT_SYMBOL_GPL(flow_offload_alloc); EXPORT_SYMBOL_GPL(flow_offload_alloc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment