media: hdpvr: Fix an error handling path in hdpvr_probe()

commit c0f71bbb810237a38734607ca4599632f7f5d47f upstream.

Here, hdpvr_register_videodev() is responsible for setup and
register a video device. Also defining and initializing a worker.
hdpvr_register_videodev() is calling by hdpvr_probe at last.
So no need to flush any work here.
Unregister v4l2, free buffers and memory. If hdpvr_probe() will fail.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
Reported-by: Andrey Konovalov <andreyknvl@google.com>
Tested-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
[krzk: backport to v4.4, still using single thread workqueue which
       is drained/destroyed now in proper step so it cannot be NULL]
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/media/usb/hdpvr/hdpvr-core.c b/drivers/media/usb/hdpvr/hdpvr-core.c
index 7b5c493f02b0a3b00f7f184d68f7252c725f1f72..9f95b048123dcedd6ac632697af8e2b3ffb8d2b5 100644 (file)
--- a/drivers/media/usb/hdpvr/hdpvr-core.c
+++ b/drivers/media/usb/hdpvr/hdpvr-core.c
@@ -297,7 +297,7 @@ static int hdpvr_probe(struct usb_interface *interface,
        /* register v4l2_device early so it can be used for printks */
        if (v4l2_device_register(&interface->dev, &dev->v4l2_dev)) {
                dev_err(&interface->dev, "v4l2_device_register failed\n");
-               goto error;
+               goto error_free_dev;
        }
 
        mutex_init(&dev->io_mutex);
@@ -306,7 +306,7 @@ static int hdpvr_probe(struct usb_interface *interface,
        dev->usbc_buf = kmalloc(64, GFP_KERNEL);
        if (!dev->usbc_buf) {
                v4l2_err(&dev->v4l2_dev, "Out of memory\n");
-               goto error;
+               goto error_v4l2_unregister;
        }
 
        init_waitqueue_head(&dev->wait_buffer);
@@ -314,7 +314,7 @@ static int hdpvr_probe(struct usb_interface *interface,
 
        dev->workqueue = create_singlethread_workqueue("hdpvr_buffer");
        if (!dev->workqueue)
-               goto error;
+               goto err_free_usbc;
 
        dev->options = hdpvr_default_options;
 
@@ -348,13 +348,13 @@ static int hdpvr_probe(struct usb_interface *interface,
        }
        if (!dev->bulk_in_endpointAddr) {
                v4l2_err(&dev->v4l2_dev, "Could not find bulk-in endpoint\n");
-               goto error;
+               goto error_put_usb;
        }
 
        /* init the device */
        if (hdpvr_device_init(dev)) {
                v4l2_err(&dev->v4l2_dev, "device init failed\n");
-               goto error;
+               goto error_put_usb;
        }
 
        mutex_lock(&dev->io_mutex);
@@ -362,7 +362,7 @@ static int hdpvr_probe(struct usb_interface *interface,
                mutex_unlock(&dev->io_mutex);
                v4l2_err(&dev->v4l2_dev,
                         "allocating transfer buffers failed\n");
-               goto error;
+               goto error_put_usb;
        }
        mutex_unlock(&dev->io_mutex);
 
@@ -370,7 +370,7 @@ static int hdpvr_probe(struct usb_interface *interface,
        retval = hdpvr_register_i2c_adapter(dev);
        if (retval < 0) {
                v4l2_err(&dev->v4l2_dev, "i2c adapter register failed\n");
-               goto error;
+               goto error_free_buffers;
        }
 
        client = hdpvr_register_ir_rx_i2c(dev);
@@ -412,15 +412,20 @@ static int hdpvr_probe(struct usb_interface *interface,
 reg_fail:
 #if IS_ENABLED(CONFIG_I2C)
        i2c_del_adapter(&dev->i2c_adapter);
+error_free_buffers:
 #endif
+       hdpvr_free_buffers(dev);
+error_put_usb:
+       usb_put_dev(dev->udev);
+       /* Destroy single thread */
+       destroy_workqueue(dev->workqueue);
+err_free_usbc:
+       kfree(dev->usbc_buf);
+error_v4l2_unregister:
+       v4l2_device_unregister(&dev->v4l2_dev);
+error_free_dev:
+       kfree(dev);
 error:
-       if (dev) {
-               /* Destroy single thread */
-               if (dev->workqueue)
-                       destroy_workqueue(dev->workqueue);
-               /* this frees allocated memory */
-               hdpvr_delete(dev);
-       }
        return retval;
 }