diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2019-08-09 19:50:30 +0200 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2019-08-27 11:10:01 +0200 |
| commit | 2340c646e6a5da658e114be2f721ff90853588d4 (patch) | |
| tree | df9744d2344e71e8c5d1b75c3e1528bc474313fe /target/linux/brcm2708/patches-4.19/950-0317-staging-bcm2835-camera-Add-sanity-checks-for-queue_s.patch | |
| parent | 81d0da118694feb874f992093063a2852285d194 (diff) | |
| download | upstream-2340c646e6a5da658e114be2f721ff90853588d4.tar.gz upstream-2340c646e6a5da658e114be2f721ff90853588d4.tar.bz2 upstream-2340c646e6a5da658e114be2f721ff90853588d4.zip | |
brcm2708: update to latest patches from RPi foundation
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.19/950-0317-staging-bcm2835-camera-Add-sanity-checks-for-queue_s.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.19/950-0317-staging-bcm2835-camera-Add-sanity-checks-for-queue_s.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/target/linux/brcm2708/patches-4.19/950-0317-staging-bcm2835-camera-Add-sanity-checks-for-queue_s.patch b/target/linux/brcm2708/patches-4.19/950-0317-staging-bcm2835-camera-Add-sanity-checks-for-queue_s.patch deleted file mode 100644 index 1cb03a6c48..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0317-staging-bcm2835-camera-Add-sanity-checks-for-queue_s.patch +++ /dev/null @@ -1,44 +0,0 @@ -From c75de411b5c596c6323174c1a403e2f811410b31 Mon Sep 17 00:00:00 2001 -From: Dave Stevenson <dave.stevenson@raspberrypi.org> -Date: Tue, 15 Jan 2019 15:35:24 +0000 -Subject: [PATCH 317/725] staging: bcm2835-camera: Add sanity checks for - queue_setup/CREATE_BUFS - -Fixes a v4l2-compliance failure when passed a buffer that is -too small. -queue_setup wasn't handling the case where !(*nplanes), as -used from CREATE_BUFS and requiring the driver to sanity -check the provided buffer parameters. It was assuming that -it was always being used in the REQBUFS case where it provides -the buffer properties. - -Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> ---- - .../bcm2835-camera/bcm2835-camera.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - ---- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c -+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c -@@ -242,6 +242,22 @@ static int queue_setup(struct vb2_queue - return -EINVAL; - } - -+ /* Handle CREATE_BUFS situation - *nplanes != 0 */ -+ if (*nplanes) { -+ if (*nplanes != 1 || -+ sizes[0] < dev->capture.port->current_buffer.size) { -+ v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev, -+ "%s: dev:%p Invalid buffer request from CREATE_BUFS, size %u < %u, nplanes %u != 1\n", -+ __func__, dev, sizes[0], -+ dev->capture.port->current_buffer.size, -+ *nplanes); -+ return -EINVAL; -+ } else { -+ return 0; -+ } -+ } -+ -+ /* Handle REQBUFS situation */ - size = dev->capture.port->current_buffer.size; - if (size == 0) { - v4l2_err(&dev->v4l2_dev, |