Re: [PATCH] usbip: fix error handling in stub_probe()

[Valentina Manea]

On Sat, Nov 29, 2014 at 12:29 AM, Alexey Khoroshilov
<khoroshilov@xxxxxxxxx> wrote:
> If usb_hub_claim_port() fails, no resources are deallocated and
> if stub_add_files() fails, port is not released.
>
> The patch fixes these issues and rearranges error handling code.
>
> Found by Linux Driver Verification project (linuxtesting.org).
>
> Signed-off-by: Alexey Khoroshilov <khoroshilov@xxxxxxxxx>
> ---
>  drivers/usb/usbip/stub_dev.c | 26 +++++++++++++++-----------
>  1 file changed, 15 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/usb/usbip/stub_dev.c b/drivers/usb/usbip/stub_dev.c
> index fac20e0434c0..a3ec49bdc1e6 100644
> --- a/drivers/usb/usbip/stub_dev.c
> +++ b/drivers/usb/usbip/stub_dev.c
> @@ -311,7 +311,6 @@ static int stub_probe(struct usb_device *udev)
>  {
>         struct stub_device *sdev = NULL;
>         const char *udev_busid = dev_name(&udev->dev);
> -       int err = 0;
>         struct bus_id_priv *busid_priv;
>         int rc;
>
> @@ -372,23 +371,28 @@ static int stub_probe(struct usb_device *udev)
>                         (struct usb_dev_state *) udev);
>         if (rc) {
>                 dev_dbg(&udev->dev, "unable to claim port\n");
> -               return rc;
> +               goto err_port;
>         }
>
> -       err = stub_add_files(&udev->dev);
> -       if (err) {
> +       rc = stub_add_files(&udev->dev);
> +       if (rc) {
>                 dev_err(&udev->dev, "stub_add_files for %s\n", udev_busid);
> -               dev_set_drvdata(&udev->dev, NULL);
> -               usb_put_dev(udev);
> -               kthread_stop_put(sdev->ud.eh);
> -
> -               busid_priv->sdev = NULL;
> -               stub_device_free(sdev);
> -               return err;
> +               goto err_files;
>         }
>         busid_priv->status = STUB_BUSID_ALLOC;
>
>         return 0;
> +err_files:
> +       usb_hub_release_port(udev->parent, udev->portnum,
> +                            (struct usb_dev_state *) udev);
> +err_port:
> +       dev_set_drvdata(&udev->dev, NULL);
> +       usb_put_dev(udev);
> +       kthread_stop_put(sdev->ud.eh);
> +
> +       busid_priv->sdev = NULL;
> +       stub_device_free(sdev);
> +       return rc;
>  }
>
>  static void shutdown_busid(struct bus_id_priv *busid_priv)
> --
> 1.9.1
>

Nice catch.

Acked-by: Valentina Manea <valentina.manea.m@xxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/