From: Kuniyuki Iwashima <kuniyu@amazon.com>
To: "David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Simon Horman <horms@kernel.org>
Cc: Ido Schimmel <idosch@idosch.org>,
Kuniyuki Iwashima <kuniyu@amazon.com>,
Kuniyuki Iwashima <kuni1840@gmail.com>, <netdev@vger.kernel.org>
Subject: [PATCH v2 net-next 7/8] net: fib_rules: Add error_free label in fib_delrule().
Date: Fri, 7 Feb 2025 16:25:01 +0900 [thread overview]
Message-ID: <20250207072502.87775-8-kuniyu@amazon.com> (raw)
In-Reply-To: <20250207072502.87775-1-kuniyu@amazon.com>
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(-)
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;
}
--
2.39.5 (Apple Git-154)
next prev parent reply other threads:[~2025-02-07 7:28 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-07 7:24 [PATCH v2 net-next 0/8] fib: rules: Convert RTM_NEWRULE and RTM_DELRULE to per-netns RTNL Kuniyuki Iwashima
2025-02-07 7:24 ` [PATCH v2 net-next 1/8] net: fib_rules: Don't check net in rule_exists() and rule_find() Kuniyuki Iwashima
2025-02-07 8:27 ` Eric Dumazet
2025-02-07 7:24 ` [PATCH v2 net-next 2/8] net: fib_rules: Pass net to fib_nl2rule() instead of skb Kuniyuki Iwashima
2025-02-07 8:28 ` Eric Dumazet
2025-02-07 7:24 ` [PATCH v2 net-next 3/8] net: fib_rules: Split fib_nl2rule() Kuniyuki Iwashima
2025-02-07 8:30 ` Eric Dumazet
2025-02-07 7:24 ` [PATCH v2 net-next 4/8] ip: fib_rules: Fetch net from fib_rule in fib[46]_rule_configure() Kuniyuki Iwashima
2025-02-07 8:34 ` Eric Dumazet
2025-02-07 7:24 ` [PATCH v2 net-next 5/8] net: fib_rules: Factorise fib_newrule() and fib_delrule() Kuniyuki Iwashima
2025-02-07 8:34 ` Eric Dumazet
2025-02-07 7:25 ` [PATCH v2 net-next 6/8] net: fib_rules: Convert RTM_NEWRULE to per-netns RTNL Kuniyuki Iwashima
2025-02-07 8:35 ` Eric Dumazet
2025-02-07 7:25 ` Kuniyuki Iwashima [this message]
2025-02-07 8:37 ` [PATCH v2 net-next 7/8] net: fib_rules: Add error_free label in fib_delrule() Eric Dumazet
2025-02-07 7:25 ` [PATCH v2 net-next 8/8] net: fib_rules: Convert RTM_DELRULE to per-netns RTNL Kuniyuki Iwashima
2025-02-07 8:36 ` Eric Dumazet
2025-02-07 8:37 ` [PATCH v2 net-next 0/8] fib: rules: Convert RTM_NEWRULE and " Eric Dumazet
2025-02-07 10:20 ` Ido Schimmel
2025-02-11 3:30 ` patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250207072502.87775-8-kuniyu@amazon.com \
--to=kuniyu@amazon.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=idosch@idosch.org \
--cc=kuba@kernel.org \
--cc=kuni1840@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.