]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
net: fib_rules: Pass net to fib_nl2rule() instead of skb.
authorKuniyuki Iwashima <kuniyu@amazon.com>
Fri, 7 Feb 2025 07:24:56 +0000 (16:24 +0900)
committerJakub Kicinski <kuba@kernel.org>
Tue, 11 Feb 2025 03:08:52 +0000 (19:08 -0800)
skb is not used in fib_nl2rule() other than sock_net(skb->sk),
which is already available in callers, fib_nl_newrule() and
fib_nl_delrule().

Let's pass net directly to fib_nl2rule().

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-3-kuniyu@amazon.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/core/fib_rules.c

index 02dfb841ab29726ebca3b416ed8adfe57a2d9888..87f7311995383429640669be2d0d0b5102945089 100644 (file)
@@ -512,14 +512,13 @@ static int fib_nl2rule_l3mdev(struct nlattr *nla, struct fib_rule *nlrule,
 }
 #endif
 
-static int fib_nl2rule(struct sk_buff *skb, struct nlmsghdr *nlh,
+static int fib_nl2rule(struct net *net, struct nlmsghdr *nlh,
                       struct netlink_ext_ack *extack,
                       struct fib_rules_ops *ops,
                       struct nlattr *tb[],
                       struct fib_rule **rule,
                       bool *user_priority)
 {
-       struct net *net = sock_net(skb->sk);
        struct fib_rule_hdr *frh = nlmsg_data(nlh);
        struct fib_rule *nlrule = NULL;
        int err = -EINVAL;
@@ -798,7 +797,7 @@ int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr *nlh,
                goto errout;
        }
 
-       err = fib_nl2rule(skb, nlh, extack, ops, tb, &rule, &user_priority);
+       err = fib_nl2rule(net, nlh, extack, ops, tb, &rule, &user_priority);
        if (err)
                goto errout;
 
@@ -906,7 +905,7 @@ int fib_nl_delrule(struct sk_buff *skb, struct nlmsghdr *nlh,
                goto errout;
        }
 
-       err = fib_nl2rule(skb, nlh, extack, ops, tb, &nlrule, &user_priority);
+       err = fib_nl2rule(net, nlh, extack, ops, tb, &nlrule, &user_priority);
        if (err)
                goto errout;