xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

thunderbolt: Bond lanes only when dual_link_port != NULL in alloc_dev_default()

Browse Source 
[ Upstream commit a0d36fa1065901f939b04587a09c65303a64ac88 ]

We should not dereference ->dual_link_port if it is NULL and lane bonding
is requested. For this reason move lane bonding configuration happen
inside the block where ->dual_link_port != NULL.

Fixes: 54509f5005 ("thunderbolt: Add KUnit tests for path walking")
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Yehezkel Bernat <YehezkelShB@gmail.com>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Mika Westerberg
2021-06-07 13:37:46 +03:00
committed by Greg Kroah-Hartman
parent 36f60700f9
commit 2abfa52947
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/thunderbolt/test.c
View File

@@ -259,14 +259,14 @@ static struct tb_switch *alloc_dev_default(struct kunit *test,
if (port->dual_link_port && upstream_port->dual_link_port) { if (port->dual_link_port && upstream_port->dual_link_port) {
port->dual_link_port->remote = upstream_port->dual_link_port; port->dual_link_port->remote = upstream_port->dual_link_port;
upstream_port->dual_link_port->remote = port->dual_link_port; upstream_port->dual_link_port->remote = port->dual_link_port;
}
if (bonded) { if (bonded) {
/* Bonding is used */ /* Bonding is used */
port->bonded = true; port->bonded = true;
port->dual_link_port->bonded = true; port->dual_link_port->bonded = true;
upstream_port->bonded = true; upstream_port->bonded = true;
upstream_port->dual_link_port->bonded = true; upstream_port->dual_link_port->bonded = true;
}
} }
return sw; return sw;