lkml.org 
[lkml]   [2021]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 05/25] HID: usbhid: free raw_report buffers in usbhid_stop
    Date
    From: Anirudh Rayabharam <mail@anirudhrb.com>

    [ Upstream commit f7744fa16b96da57187dc8e5634152d3b63d72de ]

    Free the unsent raw_report buffers when the device is removed.

    Fixes a memory leak reported by syzbot at:
    https://syzkaller.appspot.com/bug?id=7b4fa7cb1a7c2d3342a2a8a6c53371c8c418ab47

    Reported-by: syzbot+47b26cd837ececfc666d@syzkaller.appspotmail.com
    Tested-by: syzbot+47b26cd837ececfc666d@syzkaller.appspotmail.com
    Signed-off-by: Anirudh Rayabharam <mail@anirudhrb.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/hid/usbhid/hid-core.c | 13 ++++++++++++-
    1 file changed, 12 insertions(+), 1 deletion(-)

    diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
    index 6b6db57b49d6..e28227040c64 100644
    --- a/drivers/hid/usbhid/hid-core.c
    +++ b/drivers/hid/usbhid/hid-core.c
    @@ -506,7 +506,7 @@ static void hid_ctrl(struct urb *urb)

    if (unplug) {
    usbhid->ctrltail = usbhid->ctrlhead;
    - } else {
    + } else if (usbhid->ctrlhead != usbhid->ctrltail) {
    usbhid->ctrltail = (usbhid->ctrltail + 1) & (HID_CONTROL_FIFO_SIZE - 1);

    if (usbhid->ctrlhead != usbhid->ctrltail &&
    @@ -1224,9 +1224,20 @@ static void usbhid_stop(struct hid_device *hid)
    mutex_lock(&usbhid->mutex);

    clear_bit(HID_STARTED, &usbhid->iofl);
    +
    spin_lock_irq(&usbhid->lock); /* Sync with error and led handlers */
    set_bit(HID_DISCONNECTED, &usbhid->iofl);
    + while (usbhid->ctrltail != usbhid->ctrlhead) {
    + if (usbhid->ctrl[usbhid->ctrltail].dir == USB_DIR_OUT) {
    + kfree(usbhid->ctrl[usbhid->ctrltail].raw_report);
    + usbhid->ctrl[usbhid->ctrltail].raw_report = NULL;
    + }
    +
    + usbhid->ctrltail = (usbhid->ctrltail + 1) &
    + (HID_CONTROL_FIFO_SIZE - 1);
    + }
    spin_unlock_irq(&usbhid->lock);
    +
    usb_kill_urb(usbhid->urbin);
    usb_kill_urb(usbhid->urbout);
    usb_kill_urb(usbhid->urbctrl);
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-09-10 03:01    [W:4.029 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site