Commit 181302dc authored Mar 13, 2017 by Johan Hovold Committed by Ulf Hansson Mar 16, 2017

mmc: ushc: fix NULL-deref at probe

Make sure to check the number of endpoints to avoid dereferencing a
NULL-pointer should a malicious device lack endpoints.

Fixes: 53f3a9e2 ("mmc: USB SD Host Controller (USHC) driver")
Cc: stable <stable@vger.kernel.org>	# 2.6.37
Cc: David Vrabel <david.vrabel@csr.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent 2ce0c7b6

drivers/mmc/host/ushc.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -426,6 +426,9 @@ static int ushc_probe(struct usb_interface intf, const struct usb_device_id id
		struct ushc_data *ushc;
		int ret;

		if (intf->cur_altsetting->desc.bNumEndpoints < 1)
		return -ENODEV;

		mmc = mmc_alloc_host(sizeof(struct ushc_data), &intf->dev);
		if (mmc == NULL)
		return -ENOMEM;