From patchwork Tue Dec 2 14:49:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 25341 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 78F3FC326B for ; Tue, 2 Dec 2025 14:49:46 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 096E760D1F; Tue, 2 Dec 2025 15:49:45 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="k6F7gx+K"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D97BE60D0E for ; Tue, 2 Dec 2025 15:49:36 +0100 (CET) Received: from [192.168.1.104] (net-93-65-100-155.cust.vodafonedsl.it [93.65.100.155]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id E5110A06; Tue, 2 Dec 2025 15:47:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1764686843; bh=Fpi3rz7Vx1tuMGiAVwEVqdnb7Z/TYH8Mbn7AHFJLZLU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=k6F7gx+KD2TACBAXTUgCyHQfEvWgOk0QTVBuuBnJVaEox8T1MRTL/Y1VHdAkrjZhw kYn6UiMRRO7fGvSw4fexGDPqECPwt00W+BYrxtZUwRVT0L4E1ZRyAXh6BDR72csb1N EJHXJDgYyjtbM49VhtkOfhIG/Vcxt3iZmqwLu6ik= From: Jacopo Mondi Date: Tue, 02 Dec 2025 15:49:30 +0100 Subject: [PATCH v3 5/5] libcamera: camera: Ensure a request's controls are valid MIME-Version: 1.0 Message-Id: <20251202-cam-control-override-v3-5-eacab052798d@ideasonboard.com> References: <20251202-cam-control-override-v3-0-eacab052798d@ideasonboard.com> In-Reply-To: <20251202-cam-control-override-v3-0-eacab052798d@ideasonboard.com> To: libcamera-devel@lists.libcamera.org Cc: Jacopo Mondi X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1209; i=jacopo.mondi@ideasonboard.com; h=from:subject:message-id; bh=Fpi3rz7Vx1tuMGiAVwEVqdnb7Z/TYH8Mbn7AHFJLZLU=; b=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBpLvx+BAv2sTk3WmxNGkxeqqFyAQ0R98wXaJE/y PT+jUZutUWJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCaS78fgAKCRByNAaPFqFW PDqYD/0Xi2qGNoZFwgws8zecYAOO9u+lsWC/3ajOlJ4HQNJQLrhHNcP6oIOEq7ftNLJCFPZheAv Cjb2juapIKhaSSXMaMEYt82xRbAtlg78Ro5QWUwq8p0Vw6jWfrrH99Yf28IyH5bfO+kz3G5FL4x jC8VyK6kVLZBYM38UR8BFs5Iai6Df6CbuBkqw1I/uVZugtm4mzATiUCwQDljK1aoicxTWkDZiMr eL3QE7S1HJgOak3qyMWrm7WTnret/TmlEUtx0YwpskO+HYyutrfoMZ//2CtuHA2KMgOiJq5iaDF cdSVKjY2YqC5Oy3xCmaxoYFQgpWejCC5rfHTnOliOEShjjb+iUIj0y91cqq/FYqXe49FwbS337/ 4qY4SGzPGLMBXX5o1c3yvt6CXDJI9yQ95cIFcRPrX9Jl8dj8E8V0hC7IQlHPL+UZRihVpH8i1un uOOR+Ehws5PMO1eE5yumjUBK/W3C5I5ha/aZJhi7uIdeMOyT6o35HZxWrtGDi8A7IaeOjQj3arE ooq0sjjl9hkySCHP/MqigZSQeVDz0N35Mco0B4R+HjFm4eXLfvBo7DOimJzb6ARJUQ1lcIggUyt jB8ei/B7/Y0alk5kAVKLamd1nvj9SR+dz3ewvU6lsrGmnRp84pB4JOkQt0M6Eap/p+Lj4C48asu 11JZyWXXpguZXxQ== X-Developer-Key: i=jacopo.mondi@ideasonboard.com; a=openpgp; fpr=72392EDC88144A65C701EA9BA5826A2587AD026B 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" The list of controls part of a Request is initialized with the ControlInfoMap of the Camera the Request is created from. Applications can re-assign the controls list in a Request which could cause issues during serialization. Validate that the ControlList in a Request is valid when the Request is queued to the Camera by inspecting the ControlInfoMap pointer. Signed-off-by: Jacopo Mondi --- src/libcamera/camera.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp index 2e1e146a25b13b94f3a0df5935c0861f78c949ed..93cd4d5f334f982133a12cbc4caec5cdf7bb52c6 100644 --- a/src/libcamera/camera.cpp +++ b/src/libcamera/camera.cpp @@ -1345,6 +1345,12 @@ int Camera::queueRequest(Request *request) return -EINVAL; } + /* Make sure the Request has a valid control list. */ + if (request->controls().infoMap() != &controls()) { + LOG(Camera, Error) << "Invalid control list in the Request"; + return -EINVAL; + } + /* * The camera state may change until the end of the function. No locking * is however needed as PipelineHandler::queueRequest() will handle