From patchwork Tue Dec 1 16:14:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 10529 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 46AF4BE177 for ; Tue, 1 Dec 2020 16:14:47 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D913263501; Tue, 1 Dec 2020 17:14:46 +0100 (CET) Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C806863460 for ; Tue, 1 Dec 2020 17:14:45 +0100 (CET) X-Originating-IP: 93.34.118.233 Received: from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233]) (Authenticated sender: jacopo@jmondi.org) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 506B824000D; Tue, 1 Dec 2020 16:14:45 +0000 (UTC) From: Jacopo Mondi To: hanlinchen@chromium.org, libcamera-devel@lists.libcamera.org Date: Tue, 1 Dec 2020 17:14:45 +0100 Message-Id: <20201201161445.64114-1-jacopo@jmondi.org> X-Mailer: git-send-email 2.29.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] android: camera_device: Check capture_request validity 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Make sure the 'camera3_capture_request_t *' provided to CameraDevice::processCaptureRequest() is valid before attempting to access it. Signed-off-by: Jacopo Mondi Reviewed-by: Laurent Pinchart --- This patch fixes cros_camera_test: Camera3FrameTest/Camera3InvalidRequestTest.NullOrUnconfiguredRequest/* --- src/android/camera_device.cpp | 5 +++++ 1 file changed, 5 insertions(+) -- 2.29.1 diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 4eb05df0fdc2..3c8205a095ae 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -1398,6 +1398,11 @@ FrameBuffer *CameraDevice::createFrameBuffer(const buffer_handle_t camera3buffer int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Request) { + if (!camera3Request) { + LOG(HAL, Error) << "Invalid capture request"; + return -EINVAL; + } + if (!camera3Request->num_output_buffers) { LOG(HAL, Error) << "No output buffers provided"; return -EINVAL;