From patchwork Mon Apr 22 18:07:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 1096 Return-Path: Received: from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net [195.74.38.228]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id A88E7600F9 for ; Mon, 22 Apr 2019 20:08:09 +0200 (CEST) X-Halon-ID: 8a64da6b-6529-11e9-8e2c-005056917f90 Authorized-sender: niklas@soderlund.pp.se Received: from localhost.localdomain (unknown [185.224.57.161]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA id 8a64da6b-6529-11e9-8e2c-005056917f90; Mon, 22 Apr 2019 20:08:06 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Mon, 22 Apr 2019 20:07:40 +0200 Message-Id: <20190422180740.21878-1-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] libcamera: camera: Check requests before queueing them X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Apr 2019 18:08:10 -0000 Make sure all requests queued to a camera only contains streams which have been configured and belongs to the camera. Signed-off-by: Niklas Söderlund --- src/libcamera/camera.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp index 655996f26224ef49..36c7584e823eb580 100644 --- a/src/libcamera/camera.cpp +++ b/src/libcamera/camera.cpp @@ -747,6 +747,15 @@ int Camera::queueRequest(Request *request) return ret; } + for (auto const &it : request->buffers()) { + Stream *stream = it.first; + if (activeStreams_.find(stream) == activeStreams_.end()) { + LOG(Camera, Error) + << "Attempt to queue request with invalid stream"; + return -EINVAL; + } + } + return pipe_->queueRequest(this, request); }