Skip to content

Commit 1cf770d

Browse files
q2venkuba-moo
authored andcommitted
net: fib_rules: Add error_free label in fib_delrule().
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> Reviewed-by: Ido Schimmel <idosch@nvidia.com> Tested-by: Ido Schimmel <idosch@nvidia.com> Link: https://patch.msgid.link/20250207072502.87775-8-kuniyu@amazon.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 98d3a6f commit 1cf770d

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

net/core/fib_rules.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -946,23 +946,23 @@ int fib_delrule(struct net *net, struct sk_buff *skb, struct nlmsghdr *nlh,
946946

947947
err = fib_nl2rule_rtnl(nlrule, ops, tb, extack);
948948
if (err)
949-
goto errout;
949+
goto errout_free;
950950

951951
rule = rule_find(ops, frh, tb, nlrule, user_priority);
952952
if (!rule) {
953953
err = -ENOENT;
954-
goto errout;
954+
goto errout_free;
955955
}
956956

957957
if (rule->flags & FIB_RULE_PERMANENT) {
958958
err = -EPERM;
959-
goto errout;
959+
goto errout_free;
960960
}
961961

962962
if (ops->delete) {
963963
err = ops->delete(rule);
964964
if (err)
965-
goto errout;
965+
goto errout_free;
966966
}
967967

968968
if (rule->tun_id)
@@ -1008,8 +1008,9 @@ int fib_delrule(struct net *net, struct sk_buff *skb, struct nlmsghdr *nlh,
10081008
kfree(nlrule);
10091009
return 0;
10101010

1011-
errout:
1011+
errout_free:
10121012
kfree(nlrule);
1013+
errout:
10131014
rules_ops_put(ops);
10141015
return err;
10151016
}

0 commit comments

Comments
 (0)