media: CVE-2017-16644

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

Reference:
https://nvd.nist.gov/vuln/detail/CVE-2017-16644
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-4.14.y&id=dd24d173b50af3aadb1ea2e04edaa8d68ca59b23

Change-Id: I621c6fe518e5e41618c235cdacf8d9bceb3e3947
Signed-off-by: Andreas Wellving <andreas.wellving@enea.com>

1 files changed, 110 insertions, 0 deletions

diff --git a/patches/cve/CVE-2017-16644-media-hdpvr-Fix-an-error-handling-path-in-hdpvr_prob.patch b/patches/cve/CVE-2017-16644-media-hdpvr-Fix-an-error-handling-path-in-hdpvr_prob.patch
new file mode 100644
index 0000000..ee7e02a
--- /dev/null
+++ b/patches/cve/CVE-2017-16644-media-hdpvr-Fix-an-error-handling-path-in-hdpvr_prob.patch
@@ -0,0 +1,110 @@
+From dd24d173b50af3aadb1ea2e04edaa8d68ca59b23 Mon Sep 17 00:00:00 2001
+From: Arvind Yadav <arvind.yadav.cs@gmail.com>
+Date: Fri, 22 Sep 2017 09:07:06 -0400
+Subject: [PATCH] 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.
+
+CVE: CVE-2017-16644
+Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-4.14.y&id=dd24d173b50af3aadb1ea2e04edaa8d68ca59b23]
+
+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>
+Cc: Ben Hutchings <ben.hutchings@codethink.co.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Andreas Wellving <andreas.wellving@enea.com>
+---
+ drivers/media/usb/hdpvr/hdpvr-core.c | 26 +++++++++++++++-----------
+ 1 file changed, 15 insertions(+), 11 deletions(-)
+
+diff --git a/drivers/media/usb/hdpvr/hdpvr-core.c b/drivers/media/usb/hdpvr/hdpvr-core.c
+index dbe29c6c4d8b..1e8cbaf36896 100644
+--- a/drivers/media/usb/hdpvr/hdpvr-core.c
++++ b/drivers/media/usb/hdpvr/hdpvr-core.c
+@@ -292,7 +292,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);
+@@ -301,7 +301,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);
+@@ -339,13 +339,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);
+@@ -353,7 +353,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);
+ 
+@@ -361,7 +361,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);
+@@ -394,13 +394,17 @@ 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);
++       kfree(dev->usbc_buf);
++error_v4l2_unregister:
++       v4l2_device_unregister(&dev->v4l2_dev);
++error_free_dev:
++       kfree(dev);
+ error:
+-       if (dev) {
+-               flush_work(&dev->worker);
+-               /* this frees allocated memory */
+-               hdpvr_delete(dev);
+-       }
+        return retval;
+ }
+ 
+-- 
+2.20.1
+