mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-12-19 18:08:29 +00:00
52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
From f356e2a2604bfc26be8bc51bf83f6a023f06316f Mon Sep 17 00:00:00 2001
|
|
From: Oscar Maes <oscmaes92@gmail.com>
|
|
Date: Wed, 27 Aug 2025 08:23:21 +0200
|
|
Subject: [PATCH] net: ipv4: fix regression in local-broadcast routes
|
|
|
|
[ Upstream commit 5189446ba995556eaa3755a6e875bc06675b88bd ]
|
|
|
|
Commit 9e30ecf23b1b ("net: ipv4: fix incorrect MTU in broadcast routes")
|
|
introduced a regression where local-broadcast packets would have their
|
|
gateway set in __mkroute_output, which was caused by fi = NULL being
|
|
removed.
|
|
|
|
Fix this by resetting the fib_info for local-broadcast packets. This
|
|
preserves the intended changes for directed-broadcast packets.
|
|
|
|
Cc: stable@vger.kernel.org
|
|
Fixes: 9e30ecf23b1b ("net: ipv4: fix incorrect MTU in broadcast routes")
|
|
Reported-by: Brett A C Sheffield <bacs@librecast.net>
|
|
Closes: https://lore.kernel.org/regressions/20250822165231.4353-4-bacs@librecast.net
|
|
Signed-off-by: Oscar Maes <oscmaes92@gmail.com>
|
|
Reviewed-by: David Ahern <dsahern@kernel.org>
|
|
Link: https://patch.msgid.link/20250827062322.4807-1-oscmaes92@gmail.com
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
net/ipv4/route.c | 10 +++++++---
|
|
1 file changed, 7 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
|
|
index 9a5c9497b3931..261ddb6542a40 100644
|
|
--- a/net/ipv4/route.c
|
|
+++ b/net/ipv4/route.c
|
|
@@ -2532,12 +2532,16 @@ static struct rtable *__mkroute_output(const struct fib_result *res,
|
|
!netif_is_l3_master(dev_out))
|
|
return ERR_PTR(-EINVAL);
|
|
|
|
- if (ipv4_is_lbcast(fl4->daddr))
|
|
+ if (ipv4_is_lbcast(fl4->daddr)) {
|
|
type = RTN_BROADCAST;
|
|
- else if (ipv4_is_multicast(fl4->daddr))
|
|
+
|
|
+ /* reset fi to prevent gateway resolution */
|
|
+ fi = NULL;
|
|
+ } else if (ipv4_is_multicast(fl4->daddr)) {
|
|
type = RTN_MULTICAST;
|
|
- else if (ipv4_is_zeronet(fl4->daddr))
|
|
+ } else if (ipv4_is_zeronet(fl4->daddr)) {
|
|
return ERR_PTR(-EINVAL);
|
|
+ }
|
|
|
|
if (dev_out->flags & IFF_LOOPBACK)
|
|
flags |= RTCF_LOCAL;
|