From: Johan Hovold johan@kernel.org

mainline inclusion from mainline-5.4 commit 44efc269db7929f6275a1fa927ef082e533ecde0 category: bugfix bugzilla: NA DTS: NA CVE: CVE-2019-19523

-------------------------------------------------

The driver was clearing its struct usb_device pointer, which it used as an inverted disconnected flag, before deregistering the character device and without serialising against racing release().

This could lead to a use-after-free if a racing release() callback observes the cleared pointer and frees the driver data before disconnect() is finished with it.

This could also lead to NULL-pointer dereferences in a racing open().

Fixes: f08812d5eb8f ("USB: FIx locks and urb->status in adutux (updated)") Cc: stable stable@vger.kernel.org # 2.6.24 Reported-by: syzbot+0243cb250a51eeefb8cc@syzkaller.appspotmail.com Tested-by: syzbot+0243cb250a51eeefb8cc@syzkaller.appspotmail.com Signed-off-by: Johan Hovold johan@kernel.org Link: https://lore.kernel.org/r/20190925092913.8608-1-johan@kernel.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org Signed-off-by: Mao Wenan maowenan@huawei.com --- drivers/usb/misc/adutux.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c index 3071c0ef909b..2f308f5a415b 100644 --- a/drivers/usb/misc/adutux.c +++ b/drivers/usb/misc/adutux.c @@ -804,15 +804,16 @@ static void adu_disconnect(struct usb_interface *interface)

dev = usb_get_intfdata(interface);

- mutex_lock(&dev->mtx); /* not interruptible */ - dev->udev = NULL; /* poison */ minor = dev->minor; usb_deregister_dev(interface, &adu_class); - mutex_unlock(&dev->mtx);

mutex_lock(&adutux_mutex); usb_set_intfdata(interface, NULL);

+ mutex_lock(&dev->mtx); /* not interruptible */ + dev->udev = NULL; /* poison */ + mutex_unlock(&dev->mtx); + /* if the device is not opened, then we clean up right now */ if (!dev->open_count) adu_delete(dev);