Skip to content

Commit ff4a5b1

Browse files
q2vengregkh
authored andcommitted
smc: Use __sk_dst_get() and dst_dev_rcu() in smc_vlan_by_tcpsk().
[ Upstream commit 0b0e4d5 ] smc_vlan_by_tcpsk() fetches sk_dst_get(sk)->dev before RTNL and passes it to netdev_walk_all_lower_dev(), which is illegal. Also, smc_vlan_by_tcpsk_walk() does not require RTNL at all. Let's use __sk_dst_get(), dst_dev_rcu(), and netdev_walk_all_lower_dev_rcu(). Note that the returned value of smc_vlan_by_tcpsk() is not used in the caller. Fixes: 0cfdd8f ("smc: connection and link group creation") Signed-off-by: Kuniyuki Iwashima <kuniyu@google.com> Reviewed-by: Eric Dumazet <edumazet@google.com> Link: https://patch.msgid.link/20250916214758.650211-5-kuniyu@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 7dfc256 commit ff4a5b1

1 file changed

Lines changed: 12 additions & 15 deletions

File tree

net/smc/smc_core.c

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1786,35 +1786,32 @@ static int smc_vlan_by_tcpsk_walk(struct net_device *lower_dev,
17861786
/* Determine vlan of internal TCP socket. */
17871787
int smc_vlan_by_tcpsk(struct socket *clcsock, struct smc_init_info *ini)
17881788
{
1789-
struct dst_entry *dst = sk_dst_get(clcsock->sk);
17901789
struct netdev_nested_priv priv;
17911790
struct net_device *ndev;
1791+
struct dst_entry *dst;
17921792
int rc = 0;
17931793

17941794
ini->vlan_id = 0;
1795-
if (!dst) {
1796-
rc = -ENOTCONN;
1797-
goto out;
1798-
}
1799-
if (!dst->dev) {
1795+
1796+
rcu_read_lock();
1797+
1798+
dst = __sk_dst_get(clcsock->sk);
1799+
ndev = dst ? dst_dev_rcu(dst) : NULL;
1800+
if (!ndev) {
18001801
rc = -ENODEV;
1801-
goto out_rel;
1802+
goto out;
18021803
}
18031804

1804-
ndev = dst->dev;
18051805
if (is_vlan_dev(ndev)) {
18061806
ini->vlan_id = vlan_dev_vlan_id(ndev);
1807-
goto out_rel;
1807+
goto out;
18081808
}
18091809

18101810
priv.data = (void *)&ini->vlan_id;
1811-
rtnl_lock();
1812-
netdev_walk_all_lower_dev(ndev, smc_vlan_by_tcpsk_walk, &priv);
1813-
rtnl_unlock();
1814-
1815-
out_rel:
1816-
dst_release(dst);
1811+
netdev_walk_all_lower_dev_rcu(ndev, smc_vlan_by_tcpsk_walk, &priv);
18171812
out:
1813+
rcu_read_unlock();
1814+
18181815
return rc;
18191816
}
18201817

0 commit comments

Comments
 (0)