ip: fib_rules: Fetch net from fib_rule in fib[46]_rule_configure().
[ Upstream commit 5a1ccffd30a08f5a2428cd5fbb3ab03e8eb6c66d ] The following patch will not set skb->sk from VRF path. Let's fetch net from fib_rule->fr_net instead of sock_net(skb->sk) in fib[46]_rule_configure(). 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-5-kuniyu@amazon.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
22ee8dabec
commit
cc1d408e7c
@@ -222,9 +222,9 @@ static int fib4_rule_configure(struct fib_rule *rule, struct sk_buff *skb,
|
|||||||
struct nlattr **tb,
|
struct nlattr **tb,
|
||||||
struct netlink_ext_ack *extack)
|
struct netlink_ext_ack *extack)
|
||||||
{
|
{
|
||||||
struct net *net = sock_net(skb->sk);
|
struct fib4_rule *rule4 = (struct fib4_rule *)rule;
|
||||||
|
struct net *net = rule->fr_net;
|
||||||
int err = -EINVAL;
|
int err = -EINVAL;
|
||||||
struct fib4_rule *rule4 = (struct fib4_rule *) rule;
|
|
||||||
|
|
||||||
if (!inet_validate_dscp(frh->tos)) {
|
if (!inet_validate_dscp(frh->tos)) {
|
||||||
NL_SET_ERR_MSG(extack,
|
NL_SET_ERR_MSG(extack,
|
||||||
|
@@ -350,9 +350,9 @@ static int fib6_rule_configure(struct fib_rule *rule, struct sk_buff *skb,
|
|||||||
struct nlattr **tb,
|
struct nlattr **tb,
|
||||||
struct netlink_ext_ack *extack)
|
struct netlink_ext_ack *extack)
|
||||||
{
|
{
|
||||||
|
struct fib6_rule *rule6 = (struct fib6_rule *)rule;
|
||||||
|
struct net *net = rule->fr_net;
|
||||||
int err = -EINVAL;
|
int err = -EINVAL;
|
||||||
struct net *net = sock_net(skb->sk);
|
|
||||||
struct fib6_rule *rule6 = (struct fib6_rule *) rule;
|
|
||||||
|
|
||||||
if (!inet_validate_dscp(frh->tos)) {
|
if (!inet_validate_dscp(frh->tos)) {
|
||||||
NL_SET_ERR_MSG(extack,
|
NL_SET_ERR_MSG(extack,
|
||||||
|
Reference in New Issue
Block a user