Skip to content

Commit

Permalink
sched: cls_flow: fix panic on filter replace
Browse files Browse the repository at this point in the history
The following test case causes a NULL pointer dereference in cls_flow:

  tc filter add dev foo parent 1: handle 0x1 flow hash keys dst action ok
  tc filter replace dev foo parent 1: pref 49152 handle 0x1 \
            flow hash keys mark action drop

To be more precise, actually two different panics are fixed, the first
occurs because tcf_exts_init() is not called on the newly allocated
filter when we do a replace. And the second panic uncovered after that
happens since the arguments of list_replace_rcu() are swapped, the old
element needs to be the first argument and the new element the second.

Fixes: 70da9f0 ("net: sched: cls_flow use RCU")
Signed-off-by: Daniel Borkmann <[email protected]>
Acked-by: John Fastabend <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
borkmann authored and davem330 committed Jul 21, 2015
1 parent ff3532f commit 32b2f4b
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions net/sched/cls_flow.c
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,8 @@ static int flow_change(struct net *net, struct sk_buff *in_skb,
if (!fnew)
goto err2;

tcf_exts_init(&fnew->exts, TCA_FLOW_ACT, TCA_FLOW_POLICE);

fold = (struct flow_filter *)*arg;
if (fold) {
err = -EINVAL;
Expand Down Expand Up @@ -486,7 +488,6 @@ static int flow_change(struct net *net, struct sk_buff *in_skb,
fnew->mask = ~0U;
fnew->tp = tp;
get_random_bytes(&fnew->hashrnd, 4);
tcf_exts_init(&fnew->exts, TCA_FLOW_ACT, TCA_FLOW_POLICE);
}

fnew->perturb_timer.function = flow_perturbation;
Expand Down Expand Up @@ -526,7 +527,7 @@ static int flow_change(struct net *net, struct sk_buff *in_skb,
if (*arg == 0)
list_add_tail_rcu(&fnew->list, &head->filters);
else
list_replace_rcu(&fnew->list, &fold->list);
list_replace_rcu(&fold->list, &fnew->list);

*arg = (unsigned long)fnew;

Expand Down

0 comments on commit 32b2f4b

Please sign in to comment.