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

Commit 9279095a authored by David Vrabel's avatar David Vrabel Committed by Greg Kroah-Hartman
Browse files

USB: wusb: correctly check size of security descriptor. 



Reported-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Signed-off-by: default avatarDavid Vrabel <david.vrabel@csr.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2e9729d0

drivers/usb/wusbcore/security.c

+3 −3
Original line number Diff line number Diff line
@@ -205,15 +205,15 @@ int wusb_dev_sec_add(struct wusbhc *wusbhc, 
	const void *itr, *top;

	char buf[64];



	secd = kmalloc(sizeof(struct usb_security_descriptor), GFP_KERNEL);

	secd = kmalloc(sizeof(*secd), GFP_KERNEL);

	if (secd == NULL) {

		result = -ENOMEM;

		goto out;

	}



	result = usb_get_descriptor(usb_dev, USB_DT_SECURITY,

				    0, secd, sizeof(struct usb_security_descriptor));

	if (result < sizeof(secd)) {

				    0, secd, sizeof(*secd));

	if (result < sizeof(*secd)) {

		dev_err(dev, "Can't read security descriptor or "

			"not enough data: %d\n", result);

		goto out;