From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 623242F1553; Mon, 5 May 2025 23:12:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746486745; cv=none; b=s2tolm/OQVpTDbdTOk9yLxTBJSLnVsqfRl8/LdCj/+zN97Jcx9KLHl6F4bXSZkjMnC4+8Bgz1E2DM/mDIaQT+J/JqhEpItSkBIy0zuen1F2/W/jrB1TQ+UdlFjSYs6VSjsbvycBphvkimeSJWKFnIMC/HohyiA4172nJjes9klk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746486745; c=relaxed/simple; bh=1iAwpExQ0pLsNJ5i+j+9eFH8gGqdDp6OsXzfHS0ofUc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HI4aKxvI5cvYvUCi9YCK5ZfZ3LKNQF0BXMw6SUlbQvU6pKaJx6T7RkFXg8fDbGUwV6wUXAMPMR09YJnEYLA+ZJr1u6WItYfEfThJFfuo+xTJeNdLGDUwfDRoQ4ZAn3vJUJDsistT/4SMV7zWL+msUe8uC0T1UAA8CfMKfpK0Y0E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QigJ9k5q; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="QigJ9k5q" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8A7C3C4CEED; Mon, 5 May 2025 23:12:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746486743; bh=1iAwpExQ0pLsNJ5i+j+9eFH8gGqdDp6OsXzfHS0ofUc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QigJ9k5qurmwiF2MjeDsoB67FX/nLlCA7dtBPPGaYulr/O5UiQ1LXW0O1v5Xy8tuq LuDTmE7CLXZB7sZn5jGhbT9fY6FgtFwfT9ODqZeik166MVUFx5EBXWhQVtni1BsGFZ Gwo0blellPuuByCo55QUFAMLcw/mxK4vLRXCQ9bpgB0krf+yTMtCC8Y3WxC2iJdugl Vb/ezcVhL2lxlg7jBmzwzzidS839u1jqCMKGk6Cydt9sPPzsaoWRbgPhH/zIl9eyF3 7NqRyB/6z5ogScptPO8gASdqh1/lgiXfBCZpWFnT6Wjf+mGOpevDsKd07ZEy+ncqva Y+PTTsLMUfcUA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kuniyuki Iwashima , Eric Dumazet , Ido Schimmel , Jakub Kicinski , Sasha Levin , davem@davemloft.net, dsahern@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 180/212] ip: fib_rules: Fetch net from fib_rule in fib[46]_rule_configure(). Date: Mon, 5 May 2025 19:05:52 -0400 Message-Id: <20250505230624.2692522-180-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505230624.2692522-1-sashal@kernel.org> References: <20250505230624.2692522-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.136 Content-Transfer-Encoding: 8bit From: Kuniyuki Iwashima [ 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 Reviewed-by: Eric Dumazet Reviewed-by: Ido Schimmel Tested-by: Ido Schimmel Link: https://patch.msgid.link/20250207072502.87775-5-kuniyu@amazon.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/ipv4/fib_rules.c | 4 ++-- net/ipv6/fib6_rules.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c index 513f475c6a534..298a9944a3d1e 100644 --- a/net/ipv4/fib_rules.c +++ b/net/ipv4/fib_rules.c @@ -222,9 +222,9 @@ static int fib4_rule_configure(struct fib_rule *rule, struct sk_buff *skb, struct nlattr **tb, 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; - struct fib4_rule *rule4 = (struct fib4_rule *) rule; if (!inet_validate_dscp(frh->tos)) { NL_SET_ERR_MSG(extack, diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c index 6eeab21512ba9..e0f0c5f8cccda 100644 --- a/net/ipv6/fib6_rules.c +++ b/net/ipv6/fib6_rules.c @@ -350,9 +350,9 @@ static int fib6_rule_configure(struct fib_rule *rule, struct sk_buff *skb, struct nlattr **tb, struct netlink_ext_ack *extack) { + struct fib6_rule *rule6 = (struct fib6_rule *)rule; + struct net *net = rule->fr_net; int err = -EINVAL; - struct net *net = sock_net(skb->sk); - struct fib6_rule *rule6 = (struct fib6_rule *) rule; if (!inet_validate_dscp(frh->tos)) { NL_SET_ERR_MSG(extack, -- 2.39.5