| Message ID | 20250207072502.87775-8-kuniyu@amazon.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1cf770da01120c0a84d53c4dddc57a62d1ca4f96 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | fib: rules: Convert RTM_NEWRULE and RTM_DELRULE to per-netns RTNL. | expand |
On Fri, Feb 7, 2025 at 8:28 AM Kuniyuki Iwashima <kuniyu@amazon.com> wrote: > > We will hold RTNL just before calling fib_nl2rule_rtnl() in > fib_delrule() and release it before kfree(nlrule). > > Let's add a new rule to make the following change cleaner. > > Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com> Reviewed-by: Eric Dumazet <edumazet@google.com>
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c index d0995ea9d852..10a7336b8d44 100644 --- a/net/core/fib_rules.c +++ b/net/core/fib_rules.c @@ -946,23 +946,23 @@ int fib_delrule(struct net *net, struct sk_buff *skb, struct nlmsghdr *nlh, err = fib_nl2rule_rtnl(nlrule, ops, tb, extack); if (err) - goto errout; + goto errout_free; rule = rule_find(ops, frh, tb, nlrule, user_priority); if (!rule) { err = -ENOENT; - goto errout; + goto errout_free; } if (rule->flags & FIB_RULE_PERMANENT) { err = -EPERM; - goto errout; + goto errout_free; } if (ops->delete) { err = ops->delete(rule); if (err) - goto errout; + goto errout_free; } if (rule->tun_id) @@ -1008,8 +1008,9 @@ int fib_delrule(struct net *net, struct sk_buff *skb, struct nlmsghdr *nlh, kfree(nlrule); return 0; -errout: +errout_free: kfree(nlrule); +errout: rules_ops_put(ops); return err; }
We will hold RTNL just before calling fib_nl2rule_rtnl() in fib_delrule() and release it before kfree(nlrule). Let's add a new rule to make the following change cleaner. Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com> --- net/core/fib_rules.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)