diff options
| author | David Ahern <dsahern@gmail.com> | 2017-07-13 22:36:40 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-07-13 22:43:54 +0200 |
| commit | 5d89fb33223e0be32e4100623b915048b02beeec (patch) | |
| tree | 7b0aa95b996611976e9146156cafefd071016f26 /net | |
| parent | netlink: correctly document nla_put_u64_64bit() (diff) | |
| download | linux-5d89fb33223e0be32e4100623b915048b02beeec.tar.xz linux-5d89fb33223e0be32e4100623b915048b02beeec.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/fib_rules.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c index a0093e1b0235..fdcb1bcd2afa 100644 --- a/net/core/fib_rules.c +++ b/net/core/fib_rules.c @@ -400,6 +400,7 @@ int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr *nlh, err = -ENOMEM; goto errout; } + refcount_set(&rule->refcnt, 1); rule->fr_net = net; 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; } - refcount_set(&rule->refcnt, 1); - if (last) list_add_rcu(&rule->list, &last->list); else |