[libcamera-devel] [PATCH 2/5] v4l2: v4l2_camera_proxy: Fix bounds check for VIDIOC_ENUM_FMT

Paul Elder paul.elder at ideasonboard.com
Wed Jun 3 16:16:06 CEST 2020


VIDIOC_ENUM_FMT is meant to return -EINVAL if the requested index is out
of bounds. This bounds is obtained from the libcamera Camera's list of
formats. The bounds check for this list was incorrect; fix it.

Signed-off-by: Paul Elder <paul.elder at ideasonboard.com>
---
 src/v4l2/v4l2_camera_proxy.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp
index 3df4d42b..ec6d265d 100644
--- a/src/v4l2/v4l2_camera_proxy.cpp
+++ b/src/v4l2/v4l2_camera_proxy.cpp
@@ -224,7 +224,7 @@ int V4L2CameraProxy::vidioc_enum_fmt(struct v4l2_fmtdesc *arg)
 	LOG(V4L2Compat, Debug) << "Servicing vidioc_enum_fmt";
 
 	if (!validateBufferType(arg->type) ||
-	    arg->index > streamConfig_.formats().pixelformats().size())
+	    arg->index >= streamConfig_.formats().pixelformats().size())
 		return -EINVAL;
 
 	/* \todo Add map from format to description. */
-- 
2.20.1



More information about the libcamera-devel mailing list