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 0CEAE32CDE2; Mon, 5 May 2025 22:35:17 +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=1746484517; cv=none; b=STNMR40WOzvJCVdQCt5rR49iGTL1oJ+/LECOjguJwofwIsjlIb467SWo6Gj0xRDrMYTBIcRTSqTWoo/b3XIeABBdxR9u4la0SYRvEmIj22tTkeuvCk2ov0auAJiiagUHeUvOayZZt/aJDXAQHovQEQkmdpdRjqA84oq4WrdmBzE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746484517; c=relaxed/simple; bh=L5YOtzjSm03MRIwOgrZ5oKFMZJgVlQwI2CSRrmNYGX0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=MyzVLHWWVlA/7OMbuBEZtbYTHMnLq24zPTbd3O0vdNRxpYxEAZjgDBktHH9VCm1UBfPbxjeeLxMlrsbArMga48HFYmB6Np9UTNW53d5jj5nBf7+YAz+MFhx9gmSqIM5nxEWF5KgVTnzsjJ47gZ3ZljRm40OKWTy1AeZUda9S+ss= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JMtx5hOJ; 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="JMtx5hOJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B192DC4CEF1; Mon, 5 May 2025 22:35:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746484516; bh=L5YOtzjSm03MRIwOgrZ5oKFMZJgVlQwI2CSRrmNYGX0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JMtx5hOJemHe4IC3cyqnrUkBzgTbCCbCbJpQredF4GSaWh7gyNPpiqfhdZero3VmU nU2H7SGaNWcPilaREqbGt8xkBbqchvD9TKJ1mV5vpFCCxhxwvGa9ozr9PSIxNXTsr8 EOE7I5LUt3YVIp2v5CjYl8o1LmzGDU6lML2t4hLmOqHgZlr0iw8DbGgHBQI8XXOavW L/7XB42xLl/kLBGlVi661dERbqStB0DISYQBCahbZVdfw4DdlrkfDhlz92E3iHME6f cwn4lC9AmApHlNsIeKB9fw2ctv5sY5Ev0Njqkx0mjc+cDiKO68m00dtqsHJjeGKva8 EvFif89JC0onw== 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.14 511/642] ip: fib_rules: Fetch net from fib_rule in fib[46]_rule_configure(). Date: Mon, 5 May 2025 18:12:07 -0400 Message-Id: <20250505221419.2672473-511-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505221419.2672473-1-sashal@kernel.org> References: <20250505221419.2672473-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.14.5 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 9517b8667e000..041c46787d941 100644 --- a/net/ipv4/fib_rules.c +++ b/net/ipv4/fib_rules.c @@ -245,9 +245,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 (tb[FRA_FLOWLABEL] || tb[FRA_FLOWLABEL_MASK]) { NL_SET_ERR_MSG(extack, diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c index 67d39114d9a63..40af8fd6efa70 100644 --- a/net/ipv6/fib6_rules.c +++ b/net/ipv6/fib6_rules.c @@ -399,9 +399,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