projects
/
GitHub
/
LineageOS
/
G12
/
android_kernel_amlogic_linux-4.9.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4bd718d
)
usb: usbfs: fix double-free of usb memory upon submiturb error
author
Gavin Li
<git@thegavinli.com>
Sun, 4 Aug 2019 23:50:44 +0000
(16:50 -0700)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Sun, 25 Aug 2019 08:51:17 +0000
(10:51 +0200)
commit
c43f28dfdc4654e738aa6d3fd08a105b2bee758d
upstream.
Upon an error within proc_do_submiturb(), dec_usb_memory_use_count()
gets called once by the error handling tail and again by free_async().
Remove the first call.
Signed-off-by: Gavin Li <git@thegavinli.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Cc: stable <stable@vger.kernel.org>
Link:
https://lore.kernel.org/r/20190804235044.22327-1-gavinli@thegavinli.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/core/devio.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/usb/core/devio.c
b/drivers/usb/core/devio.c
index 52fc2084b310db59653d74deddd219bd32f011b6..06a8f645106bf0d958959e55be70f4ac89042f7f 100644
(file)
--- a/
drivers/usb/core/devio.c
+++ b/
drivers/usb/core/devio.c
@@
-1810,8
+1810,6
@@
static int proc_do_submiturb(struct usb_dev_state *ps, struct usbdevfs_urb *uurb
return 0;
error:
- if (as && as->usbm)
- dec_usb_memory_use_count(as->usbm, &as->usbm->urb_use_count);
kfree(isopkt);
kfree(dr);
if (as)