lkml.org 
[lkml]   [2022]   [Mar]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 003/121] HID: elo: Revert USB reference counting
    Date
    From: Jiri Kosina <jkosina@suse.cz>

    [ Upstream commit ac89895213d8950dba6ab342863a0959f73142a7 ]

    Commit 817b8b9c539 ("HID: elo: fix memory leak in elo_probe") introduced
    memory leak on error path, but more importantly the whole USB reference
    counting is not needed at all in the first place, as the driver itself
    doesn't change the reference counting in any way, and the associated
    usb_device is guaranteed to be kept around by USB core as long as the
    driver binding exists.

    Reported-by: Alan Stern <stern@rowland.harvard.edu>
    Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
    Fixes: fbf42729d0e ("HID: elo: update the reference count of the usb device structure")
    Fixes: 817b8b9c539 ("HID: elo: fix memory leak in elo_probe")
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/hid/hid-elo.c | 7 +------
    1 file changed, 1 insertion(+), 6 deletions(-)

    diff --git a/drivers/hid/hid-elo.c b/drivers/hid/hid-elo.c
    index 9b42b0cdeef0..2876cb6a7dca 100644
    --- a/drivers/hid/hid-elo.c
    +++ b/drivers/hid/hid-elo.c
    @@ -228,7 +228,6 @@ static int elo_probe(struct hid_device *hdev, const struct hid_device_id *id)
    {
    struct elo_priv *priv;
    int ret;
    - struct usb_device *udev;

    if (!hid_is_usb(hdev))
    return -EINVAL;
    @@ -238,8 +237,7 @@ static int elo_probe(struct hid_device *hdev, const struct hid_device_id *id)
    return -ENOMEM;

    INIT_DELAYED_WORK(&priv->work, elo_work);
    - udev = interface_to_usbdev(to_usb_interface(hdev->dev.parent));
    - priv->usbdev = usb_get_dev(udev);
    + priv->usbdev = interface_to_usbdev(to_usb_interface(hdev->dev.parent));

    hid_set_drvdata(hdev, priv);

    @@ -262,7 +260,6 @@ static int elo_probe(struct hid_device *hdev, const struct hid_device_id *id)

    return 0;
    err_free:
    - usb_put_dev(udev);
    kfree(priv);
    return ret;
    }
    @@ -271,8 +268,6 @@ static void elo_remove(struct hid_device *hdev)
    {
    struct elo_priv *priv = hid_get_drvdata(hdev);

    - usb_put_dev(priv->usbdev);
    -
    hid_hw_stop(hdev);
    cancel_delayed_work_sync(&priv->work);
    kfree(priv);
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-03-14 13:30    [W:4.094 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site