lkml.org 
[lkml]   [2021]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 151/168] net: hso: add failure handler for add_net_device
    Date
    From: Ziyang Xuan <william.xuanziyang@huawei.com>

    [ Upstream commit ecdc28defc46af476566fffd9e5cb4495a2f176e ]

    If the network devices connected to the system beyond
    HSO_MAX_NET_DEVICES. add_net_device() in hso_create_net_device()
    will be failed for the network_table is full. It will lead to
    business failure which rely on network_table, for example,
    hso_suspend() and hso_resume(). It will also lead to memory leak
    because resource release process can not search the hso_device
    object from network_table in hso_free_interface().

    Add failure handler for add_net_device() in hso_create_net_device()
    to solve the above problems.

    Fixes: 72dc1c096c70 ("HSO: add option hso driver")
    Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/usb/hso.c | 11 ++++++++---
    1 file changed, 8 insertions(+), 3 deletions(-)

    diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
    index dec96e8ab567..18e0ca85f653 100644
    --- a/drivers/net/usb/hso.c
    +++ b/drivers/net/usb/hso.c
    @@ -2536,13 +2536,17 @@ static struct hso_device *hso_create_net_device(struct usb_interface *interface,
    if (!hso_net->mux_bulk_tx_buf)
    goto err_free_tx_urb;

    - add_net_device(hso_dev);
    + result = add_net_device(hso_dev);
    + if (result) {
    + dev_err(&interface->dev, "Failed to add net device\n");
    + goto err_free_tx_buf;
    + }

    /* registering our net device */
    result = register_netdev(net);
    if (result) {
    dev_err(&interface->dev, "Failed to register device\n");
    - goto err_free_tx_buf;
    + goto err_rmv_ndev;
    }

    hso_log_port(hso_dev);
    @@ -2551,8 +2555,9 @@ static struct hso_device *hso_create_net_device(struct usb_interface *interface,

    return hso_dev;

    -err_free_tx_buf:
    +err_rmv_ndev:
    remove_net_device(hso_dev);
    +err_free_tx_buf:
    kfree(hso_net->mux_bulk_tx_buf);
    err_free_tx_urb:
    usb_free_urb(hso_net->mux_bulk_tx_urb);
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-09-20 20:59    [W:2.194 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site