diff options
| author | Mika Westerberg <mika.westerberg@linux.intel.com> | 2021-06-07 13:37:46 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-14 16:56:44 +0200 |
| commit | 2abfa5294717df154e345df77d58b794f8c9d5ba (patch) | |
| tree | e0689c04fd5e5db68206dca4ce7853befb607b2c /drivers | |
| parent | 36f60700f966627088a67c31c719a50c8e875315 (diff) | |
| download | linux-2abfa5294717df154e345df77d58b794f8c9d5ba.tar.gz linux-2abfa5294717df154e345df77d58b794f8c9d5ba.tar.bz2 linux-2abfa5294717df154e345df77d58b794f8c9d5ba.zip | |
thunderbolt: Bond lanes only when dual_link_port != NULL in alloc_dev_default()
[ 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: 54509f5005ca ("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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/thunderbolt/test.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/thunderbolt/test.c b/drivers/thunderbolt/test.c index 464c2d37b992..e254f8c37cb7 100644 --- a/drivers/thunderbolt/test.c +++ b/drivers/thunderbolt/test.c @@ -259,14 +259,14 @@ static struct tb_switch *alloc_dev_default(struct kunit *test, if (port->dual_link_port && 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; - } - if (bonded) { - /* Bonding is used */ - port->bonded = true; - port->dual_link_port->bonded = true; - upstream_port->bonded = true; - upstream_port->dual_link_port->bonded = true; + if (bonded) { + /* Bonding is used */ + port->bonded = true; + port->dual_link_port->bonded = true; + upstream_port->bonded = true; + upstream_port->dual_link_port->bonded = true; + } } return sw; |