Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b43611cd authored by Gavin Li's avatar Gavin Li Committed by Greg Kroah-Hartman
Browse files

usb: usbfs: fix double-free of usb memory upon submiturb error 



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: default avatarGavin Li <git@thegavinli.com>
Acked-by: default avatarAlan 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6dbc3b74

drivers/usb/core/devio.c

+0 −2
Original line number Diff line number Diff line
@@ -1792,8 +1792,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)