Commit ca260ece authored Mar 13, 2017 by Johan Hovold Committed by Kalle Valo Mar 22, 2017

zd1211rw: fix NULL-deref at probe



Make sure to check the number of endpoints to avoid dereferencing a
NULL-pointer or accessing memory beyond the endpoint array should a
malicious device lack the expected endpoints.

Fixes: a1030e92 ("[PATCH] zd1211rw: Convert installer CDROM device into WLAN device")
Cc: Daniel Drake <dsd@gentoo.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

parent 5ce33b60

drivers/net/wireless/zydas/zd1211rw/zd_usb.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1278,6 +1278,9 @@ static int eject_installer(struct usb_interface *intf)
		u8 bulk_out_ep;
		int r;

		if (iface_desc->desc.bNumEndpoints < 2)
		return -ENODEV;

		/* Find bulk out endpoint */
		for (r = 1; r >= 0; r--) {
		endpoint = &iface_desc->endpoint[r].desc;