summaryrefslogtreecommitdiff
path: root/src/v4l2/v4l2_camera_proxy.h
diff options
context:
space:
mode:
authorPaul Elder <paul.elder@ideasonboard.com>2020-06-16 18:23:43 +0900
committerPaul Elder <paul.elder@ideasonboard.com>2020-06-25 23:47:13 +0900
commitb5d61c86ab23baf420764cbcc4814aee42d34a9d (patch)
treea8bd6fd8f79b527d3233dc595afec121211ceb11 /src/v4l2/v4l2_camera_proxy.h
parent02802aa11f0ba25718c09ac836188701065cba9a (diff)
v4l2: v4l2_camera_proxy: Check for null arg values in main ioctl handler
The ioctl handlers currently don't check if arg is null, so if it ever is, it will cause a segfault. Check that arg is null and return -EFAULT in the main vidioc ioctl handler. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src/v4l2/v4l2_camera_proxy.h')
-rw-r--r--src/v4l2/v4l2_camera_proxy.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/v4l2/v4l2_camera_proxy.h b/src/v4l2/v4l2_camera_proxy.h
index 36d1dbc8..86c1a7df 100644
--- a/src/v4l2/v4l2_camera_proxy.h
+++ b/src/v4l2/v4l2_camera_proxy.h
@@ -11,6 +11,7 @@
#include <linux/videodev2.h>
#include <map>
#include <memory>
+#include <set>
#include <sys/mman.h>
#include <sys/types.h>
#include <vector>
@@ -68,6 +69,8 @@ private:
static PixelFormat v4l2ToDrm(uint32_t format);
static uint32_t drmToV4L2(const PixelFormat &format);
+ static const std::set<unsigned long> supportedIoctls_;
+
unsigned int refcount_;
unsigned int index_;