Преглед изворни кода

net: set fib rule refcount after malloc

The configure callback of fib_rules_ops can change the refcnt of a
fib rule. For instance, mlxsw takes a refcnt when adding the processing
of the rule to a work queue. Thus the rule refcnt can not be reset to
to 1 afterwards. Move the refcnt setting to after the allocation.

Fixes: 5361e209dd30 ("net: avoid one splat in fib_nl_delrule()")
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
David Ahern пре 8 година
родитељ
комит
5d89fb3322
1 измењених фајлова са 1 додато и 2 уклоњено
  1. 1 2
      net/core/fib_rules.c

+ 1 - 2
net/core/fib_rules.c

@@ -400,6 +400,7 @@ int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr *nlh,
 		err = -ENOMEM;
 		err = -ENOMEM;
 		goto errout;
 		goto errout;
 	}
 	}
+	refcount_set(&rule->refcnt, 1);
 	rule->fr_net = net;
 	rule->fr_net = net;
 
 
 	rule->pref = tb[FRA_PRIORITY] ? nla_get_u32(tb[FRA_PRIORITY])
 	rule->pref = tb[FRA_PRIORITY] ? nla_get_u32(tb[FRA_PRIORITY])
@@ -517,8 +518,6 @@ int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr *nlh,
 		last = r;
 		last = r;
 	}
 	}
 
 
-	refcount_set(&rule->refcnt, 1);
-
 	if (last)
 	if (last)
 		list_add_rcu(&rule->list, &last->list);
 		list_add_rcu(&rule->list, &last->list);
 	else
 	else