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

Commit 29db623f authored by Andrey Konovalov's avatar Andrey Konovalov Committed by Gerrit - the friendly Code Review server
Browse files

USB: core: only clean up what we allocated 



When cleaning up the configurations, make sure we only free the number
of configurations and interfaces that we could have allocated.

Change-Id: I81b9513cc2ccc8bdd5e98982bb66e34711f61883
Reported-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


Git-commit: 32fd87b3bbf5f7a045546401dfe2894dbbf4d8c3
Signed-off-by: default avatarDennis Cagle <dcagle@codeaurora.org>
parent a980a6a3

drivers/usb/core/config.c

+6 −3
Original line number Diff line number Diff line
@@ -768,18 +768,21 @@ void usb_destroy_configuration(struct usb_device *dev) 
		return;



	if (dev->rawdescriptors) {

		for (i = 0; i < dev->descriptor.bNumConfigurations; i++)

		for (i = 0; i < dev->descriptor.bNumConfigurations &&

				i < USB_MAXCONFIG; i++)

			kfree(dev->rawdescriptors[i]);



		kfree(dev->rawdescriptors);

		dev->rawdescriptors = NULL;

	}



	for (c = 0; c < dev->descriptor.bNumConfigurations; c++) {

	for (c = 0; c < dev->descriptor.bNumConfigurations &&

			c < USB_MAXCONFIG; c++) {

		struct usb_host_config *cf = &dev->config[c];



		kfree(cf->string);

		for (i = 0; i < cf->desc.bNumInterfaces; i++) {

		for (i = 0; i < cf->desc.bNumInterfaces &&

				i < USB_MAXINTERFACES; i++) {

			if (cf->intf_cache[i])

				kref_put(&cf->intf_cache[i]->ref,

					  usb_release_interface_cache);