linux-kernel - Re: [PATCH] mmc: ushc: fix NULL-deref at probe

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAPDyKFpGQ-Kf39jc9cgWGeQb7PNActRXMOzYAX+szXfhb+fruw@mail.gmail.com>
Date:   Thu, 16 Mar 2017 15:46:25 +0100
From:   Ulf Hansson <ulf.hansson@...aro.org>
To:     Johan Hovold <johan@...nel.org>
Cc:     "linux-mmc@...r.kernel.org" <linux-mmc@...r.kernel.org>,
        Linux USB List <linux-usb@...r.kernel.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        stable <stable@...r.kernel.org>,
        David Vrabel <david.vrabel@....com>
Subject: Re: [PATCH] mmc: ushc: fix NULL-deref at probe

On 13 March 2017 at 13:40, Johan Hovold <johan@...nel.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@...r.kernel.org>     # 2.6.37
> Cc: David Vrabel <david.vrabel@....com>
> Signed-off-by: Johan Hovold <johan@...nel.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
>