From patchwork Fri Jun 19 05:41:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 4094 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3F8D4609B3 for ; Fri, 19 Jun 2020 07:42:06 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="DEM+aRg2"; dkim-atps=neutral Received: from jade.flets-east.jp (unknown [IPv6:2400:4051:61:600:e972:d773:e99a:4f79]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 1FE59556; Fri, 19 Jun 2020 07:42:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1592545325; bh=b+SYRZB8mkMQgjcjO0CZfoF0cBbxQ7PSL4voYt6+5dw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DEM+aRg2kfAPLJbJqB838avZsQt2ZxUoo6/pGNp4EZcflcCSdSl64NbtN2XR/BC/j Ypgzs8cQVweYd4g3l4cMqle7o8GPXAoLxNtqyUGVcrDX3xMo6I59ZqlOBOAR+nQoL5 COebupB33prCijjLjluRvmroC7YhQLyNxGs/yjag= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Fri, 19 Jun 2020 14:41:20 +0900 Message-Id: <20200619054123.19052-15-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619054123.19052-1-paul.elder@ideasonboard.com> References: <20200619054123.19052-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 14/17] v4l2: v4l2_camera_proxy: Check arg->index bounds for querybuf, qbuf, dqbuf X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Jun 2020 05:42:06 -0000 There were no bounds checks for the index argument for VIDIOC_QUERYBUF, VIDIOC_QBUF, and VIDIOC_DQBUF. Add them. Signed-off-by: Paul Elder Reviewed-by: Jacopo Mondi Reviewed-by: Laurent Pinchart --- No change in v2 --- src/v4l2/v4l2_camera_proxy.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp index 2723450..8396f58 100644 --- a/src/v4l2/v4l2_camera_proxy.cpp +++ b/src/v4l2/v4l2_camera_proxy.cpp @@ -540,6 +540,9 @@ int V4L2CameraProxy::vidioc_querybuf(V4L2CameraFile *cf, struct v4l2_buffer *arg { LOG(V4L2Compat, Debug) << "Servicing vidioc_querybuf fd = " << cf->efd(); + if (arg->index >= bufferCount_) + return -EINVAL; + int ret = lock(cf); if (ret < 0) return ret; @@ -560,6 +563,9 @@ int V4L2CameraProxy::vidioc_qbuf(V4L2CameraFile *cf, struct v4l2_buffer *arg) LOG(V4L2Compat, Debug) << "Servicing vidioc_qbuf, index = " << arg->index << " fd = " << cf->efd(); + if (arg->index >= bufferCount_) + return -EINVAL; + int ret = lock(cf); if (ret < 0) return ret; @@ -586,6 +592,9 @@ int V4L2CameraProxy::vidioc_dqbuf(V4L2CameraFile *cf, struct v4l2_buffer *arg) if (!vcam_->isRunning()) return -EINVAL; + if (arg->index >= bufferCount_) + return -EINVAL; + int ret = lock(cf); if (ret < 0) return ret;