Skip to content

Commit 2c10b14

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 a6cd64e commit 2c10b14

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
@@ -1878,35 +1878,32 @@ static int smc_vlan_by_tcpsk_walk(struct net_device *lower_dev,
18781878
/* Determine vlan of internal TCP socket. */
18791879
int smc_vlan_by_tcpsk(struct socket *clcsock, struct smc_init_info *ini)
18801880
{
1881-
struct dst_entry *dst = sk_dst_get(clcsock->sk);
18821881
struct netdev_nested_priv priv;
18831882
struct net_device *ndev;
1883+
struct dst_entry *dst;
18841884
int rc = 0;
18851885

18861886
ini->vlan_id = 0;
1887-
if (!dst) {
1888-
rc = -ENOTCONN;
1889-
goto out;
1890-
}
1891-
if (!dst->dev) {
1887+
1888+
rcu_read_lock();
1889+
1890+
dst = __sk_dst_get(clcsock->sk);
1891+
ndev = dst ? dst_dev_rcu(dst) : NULL;
1892+
if (!ndev) {
18921893
rc = -ENODEV;
1893-
goto out_rel;
1894+
goto out;
18941895
}
18951896

1896-
ndev = dst->dev;
18971897
if (is_vlan_dev(ndev)) {
18981898
ini->vlan_id = vlan_dev_vlan_id(ndev);
1899-
goto out_rel;
1899+
goto out;
19001900
}
19011901

19021902
priv.data = (void *)&ini->vlan_id;
1903-
rtnl_lock();
1904-
netdev_walk_all_lower_dev(ndev, smc_vlan_by_tcpsk_walk, &priv);
1905-
rtnl_unlock();
1906-
1907-
out_rel:
1908-
dst_release(dst);
1903+
netdev_walk_all_lower_dev_rcu(ndev, smc_vlan_by_tcpsk_walk, &priv);
19091904
out:
1905+
rcu_read_unlock();
1906+
19101907
return rc;
19111908
}
19121909

0 commit comments

Comments
 (0)