tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipv4: use RCU protection in __ip_rt_update_pmtu()

Browse Source 
[ Upstream commit 139512191bd06f1b496117c76372b2ce372c9a41 ]

__ip_rt_update_pmtu() must use RCU protection to make
sure the net structure it reads does not disappear.

Fixes: 2fbc6e89b2 ("ipv4: Update exception handling for multipath routes via same device")
Fixes: 1de6b15a43 ("Namespaceify min_pmtu sysctl")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Link: https://patch.msgid.link/20250205155120.1676781-8-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Eric Dumazet
2025-02-05 15:51:15 +00:00
committed by Greg Kroah-Hartman
parent 7f5005457b
commit 4583748b65
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/ipv4/route.c
+6 -5
View File
@@ -1008,9 +1008,9 @@ out: kfree_skb_reason(skb, reason);
static void __ip_rt_update_pmtu(struct rtable *rt, struct flowi4 *fl4, u32 mtu) static void __ip_rt_update_pmtu(struct rtable *rt, struct flowi4 *fl4, u32 mtu)
{ {
struct dst_entry *dst = &rt->dst; struct dst_entry *dst = &rt->dst;
struct net *net = dev_net(dst->dev);
struct fib_result res; struct fib_result res;
bool lock = false; bool lock = false;
struct net *net;
u32 old_mtu; u32 old_mtu;
if (ip_mtu_locked(dst)) if (ip_mtu_locked(dst))
@@ -1020,6 +1020,8 @@ static void __ip_rt_update_pmtu(struct rtable *rt, struct flowi4 *fl4, u32 mtu)
if (old_mtu < mtu) if (old_mtu < mtu)
return; return;
rcu_read_lock();
net = dev_net_rcu(dst->dev);
if (mtu < net->ipv4.ip_rt_min_pmtu) { if (mtu < net->ipv4.ip_rt_min_pmtu) {
lock = true; lock = true;
mtu = min(old_mtu, net->ipv4.ip_rt_min_pmtu); mtu = min(old_mtu, net->ipv4.ip_rt_min_pmtu);
@@ -1027,9 +1029,8 @@ static void __ip_rt_update_pmtu(struct rtable *rt, struct flowi4 *fl4, u32 mtu)
if (rt->rt_pmtu == mtu && !lock && if (rt->rt_pmtu == mtu && !lock &&
time_before(jiffies, dst->expires - net->ipv4.ip_rt_mtu_expires / 2)) time_before(jiffies, dst->expires - net->ipv4.ip_rt_mtu_expires / 2))
return; goto out;
rcu_read_lock();
if (fib_lookup(net, fl4, &res, 0) == 0) { if (fib_lookup(net, fl4, &res, 0) == 0) {
struct fib_nh_common *nhc; struct fib_nh_common *nhc;
@@ -1043,14 +1044,14 @@ static void __ip_rt_update_pmtu(struct rtable *rt, struct flowi4 *fl4, u32 mtu)
update_or_create_fnhe(nhc, fl4->daddr, 0, mtu, lock, update_or_create_fnhe(nhc, fl4->daddr, 0, mtu, lock,
jiffies + net->ipv4.ip_rt_mtu_expires); jiffies + net->ipv4.ip_rt_mtu_expires);
} }
rcu_read_unlock(); goto out;
return;
} }
#endif /* CONFIG_IP_ROUTE_MULTIPATH */ #endif /* CONFIG_IP_ROUTE_MULTIPATH */
nhc = FIB_RES_NHC(res); nhc = FIB_RES_NHC(res);
update_or_create_fnhe(nhc, fl4->daddr, 0, mtu, lock, update_or_create_fnhe(nhc, fl4->daddr, 0, mtu, lock,
jiffies + net->ipv4.ip_rt_mtu_expires); jiffies + net->ipv4.ip_rt_mtu_expires);
} }
out:
rcu_read_unlock(); rcu_read_unlock();
} }