evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "usb: gadget: Fix double free of device descriptor pointers"

Browse source
This commit is contained in:
Linux Build Service Account 2018-12-10 06:00:39 -08:00 • committed by Gerrit - the friendly Code Review server
commit d07ffb8fe2
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/usb/gadget/function/f_gsi.c
View file

@ -2843,16 +2843,13 @@ static void gsi_unbind(struct usb_configuration *c, struct usb_function *f)
if (gsi->prot_id == IPA_USB_MBIM) if (gsi->prot_id == IPA_USB_MBIM)
mbim_gsi_ext_config_desc.function.subCompatibleID[0] = 0; mbim_gsi_ext_config_desc.function.subCompatibleID[0] = 0;
if (gadget_is_superspeed(c->cdev->gadget)) { if (gadget_is_superspeed(c->cdev->gadget))
usb_free_descriptors(f->ss_descriptors); usb_free_descriptors(f->ss_descriptors);
f->ss_descriptors = NULL;
} if (gadget_is_dualspeed(c->cdev->gadget))
if (gadget_is_dualspeed(c->cdev->gadget)) {
usb_free_descriptors(f->hs_descriptors); usb_free_descriptors(f->hs_descriptors);
f->hs_descriptors = NULL;
}
usb_free_descriptors(f->fs_descriptors); usb_free_descriptors(f->fs_descriptors);
f->fs_descriptors = NULL;
if (gsi->c_port.notify) { if (gsi->c_port.notify) {
kfree(gsi->c_port.notify_req->buf); kfree(gsi->c_port.notify_req->buf);

1
include/linux/usb/gadget.h
View file

@ -1456,6 +1456,7 @@ struct usb_descriptor_header **usb_copy_descriptors(
static inline void usb_free_descriptors(struct usb_descriptor_header **v) static inline void usb_free_descriptors(struct usb_descriptor_header **v)
{ {
kfree(v); kfree(v);
v = NULL;
} }
struct usb_function; struct usb_function;