From patchwork Wed Jun 24 14:52:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 8411 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 42850609C6 for ; Wed, 24 Jun 2020 16:53:47 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="fvSFpgzY"; dkim-atps=neutral Received: from jade.rasen.tech (unknown [IPv6:2400:4051:61:600:8147:f2a2:a8c6:9087]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 4561F2A8; Wed, 24 Jun 2020 16:53:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1593010427; bh=e1QUHIZoXqFfUEYT6CYHNordEr8bQNKNVL3BASPPqWY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fvSFpgzYB2EY1MkYLi9u+DH2bPXR4nbv2orObrE4lXSqit+QpF5wFHDEF3fbtkJhZ 0Du8WtoOGHekjgxLO46y8utPh5+HH1b+FazLdTVxRFuRNsfGorNq0uMQZWJalQCKMO qIW/u0gGcxZ0/PhubdnnQvYKLphbfr5WZNHlOvQg= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Wed, 24 Jun 2020 23:52:47 +0900 Message-Id: <20200624145256.48266-14-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200624145256.48266-1-paul.elder@ideasonboard.com> References: <20200624145256.48266-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 13/22] v4l2: v4l2_camera_proxy: Disallow dqbuf when not streaming 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: Wed, 24 Jun 2020 14:53:47 -0000 Make VIDIOC_DQBUF return -EINVAL if the stream is not turned on. Signed-off-by: Paul Elder Reviewed-by: Laurent Pinchart --- No change in v4 Changes in v3: - move isRunning check to after taking lock New in v2 (split from "v4l2: v4l2_camera: Add isRunning()") --- src/v4l2/v4l2_camera_proxy.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp index b027f8f..f8e8d79 100644 --- a/src/v4l2/v4l2_camera_proxy.cpp +++ b/src/v4l2/v4l2_camera_proxy.cpp @@ -582,6 +582,9 @@ int V4L2CameraProxy::vidioc_dqbuf(V4L2CameraFile *file, struct v4l2_buffer *arg) if (!hasOwnership(file)) return -EBUSY; + if (!vcam_->isRunning()) + return -EINVAL; + if (!validateBufferType(arg->type) || !validateMemoryType(arg->memory)) return -EINVAL;