* [PATCH] mmc: ushc: fix NULL-deref at probe
@ 2017-03-13 12:40 Johan Hovold
2017-03-16 14:46 ` Ulf Hansson
0 siblings, 1 reply; 2+ messages in thread
From: Johan Hovold @ 2017-03-13 12:40 UTC (permalink / raw)
To: Ulf Hansson
Cc: linux-mmc, linux-usb, linux-kernel, Johan Hovold, stable,
David Vrabel
Make sure to check the number of endpoints to avoid dereferencing a
NULL-pointer should a malicious device lack endpoints.
Fixes: 53f3a9e26ed5 ("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>
---
drivers/mmc/host/ushc.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/mmc/host/ushc.c b/drivers/mmc/host/ushc.c
index d2c386f09d69..1d843357422e 100644
--- a/drivers/mmc/host/ushc.c
+++ b/drivers/mmc/host/ushc.c
@@ -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;
--
2.12.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mmc: ushc: fix NULL-deref at probe
2017-03-13 12:40 [PATCH] mmc: ushc: fix NULL-deref at probe Johan Hovold
@ 2017-03-16 14:46 ` Ulf Hansson
0 siblings, 0 replies; 2+ messages in thread
From: Ulf Hansson @ 2017-03-16 14:46 UTC (permalink / raw)
To: Johan Hovold
Cc: linux-mmc@vger.kernel.org, Linux USB List,
linux-kernel@vger.kernel.org, stable, David Vrabel
On 13 March 2017 at 13:40, Johan Hovold <johan@kernel.org> wrote:
> Make sure to check the number of endpoints to avoid dereferencing a
> NULL-pointer should a malicious device lack endpoints.
>
> Fixes: 53f3a9e26ed5 ("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>
Thanks, applied for fixes!
Kind regards
Uffe
> ---
> drivers/mmc/host/ushc.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/mmc/host/ushc.c b/drivers/mmc/host/ushc.c
> index d2c386f09d69..1d843357422e 100644
> --- a/drivers/mmc/host/ushc.c
> +++ b/drivers/mmc/host/ushc.c
> @@ -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;
> --
> 2.12.0
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-03-16 14:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-13 12:40 [PATCH] mmc: ushc: fix NULL-deref at probe Johan Hovold
2017-03-16 14:46 ` Ulf Hansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).