lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 610/700] thunderbolt: Bond lanes only when dual_link_port != NULL in alloc_dev_default()
    Date
    From: Mika Westerberg <mika.westerberg@linux.intel.com>

    [ 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>
    ---
    drivers/thunderbolt/test.c | 14 +++++++-------
    1 file 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;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 10:09    [W:4.105 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site