{"id":17552,"url":"https://patchwork.libcamera.org/api/patches/17552/?format=json","web_url":"https://patchwork.libcamera.org/patch/17552/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<83a11c1c-c9a9-3aa7-30f4-5c0d257483b9@gmx.de>","date":"2022-10-06T18:18:55","name":"[libcamera-devel] Fwd: [PATCH v3] libcamera: controls: validate all ControlInfo values","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"d5f2e97f47ddbf75615250912a25b8593477f14c","submitter":{"id":111,"url":"https://patchwork.libcamera.org/api/people/111/?format=json","name":"Christian Rauch","email":"Rauch.Christian@gmx.de"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/17552/mbox/","series":[{"id":3538,"url":"https://patchwork.libcamera.org/api/series/3538/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3538","date":"2022-10-06T18:18:55","name":"[libcamera-devel] Fwd: [PATCH v3] libcamera: controls: validate all ControlInfo values","version":1,"mbox":"https://patchwork.libcamera.org/series/3538/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/17552/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/17552/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 5F86FC0DA4\n\tfor ;\n\tThu, 6 Oct 2022 18:18:58 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B387B62CF2;\n\tThu, 6 Oct 2022 20:18:57 +0200 (CEST)","from mout.gmx.net (mout.gmx.net [212.227.17.20])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2F16C62CEC\n\tfor ;\n\tThu, 6 Oct 2022 20:18:56 +0200 (CEST)","from [192.168.0.158] ([88.152.184.103]) by mail.gmx.net (mrgmx105\n\t[212.227.17.168]) with ESMTPSA (Nemesis) id\n\t1MHXBp-1oT3Co2uI5-00DTZu for\n\t; Thu, 06 Oct 2022 20:18:55 +0200"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1665080337;\n\tbh=hdH3NdwaG0DzeGnQT2oVeZZnBXm2BVkISqKRA0fNCt4=;\n\th=Date:References:To:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=1s8SgUyvhsoMzrVWXk3fpXDULvQfLPhD6jR5EJGx5eXcbU7JPL6IacIrQPM025g3r\n\tUUEpebTUvygarZ3NnBcIVEqOUdCvzZM70s9Vge2LkAW2FNXPQHovy1r8o5lFZEF7BM\n\tNVDdF4EPvsBeYAt+sv63Q4dkOxPOnFK7z+ydylZPDMT3HCe3jmtkNUxF8RXjs52HB9\n\t2ogiQzv+R1SL3xRofKnCEvlnRAgKFslj2JVsbFn0LUfL00pJugJjgK8INfN9Jmb3RN\n\tQQlxd22WmnSHWcodkToWxSsZG+hIiq6HxduzX9Q3AifzwSBDHS6+afJOe97pJzQaPi\n\tJZKFY1/gUxbfw==","v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;\n\ts=badeba3b8450; t=1665080335;\n\tbh=hdH3NdwaG0DzeGnQT2oVeZZnBXm2BVkISqKRA0fNCt4=;\n\th=X-UI-Sender-Class:Date:Subject:References:To:From:In-Reply-To;\n\tb=iD7sttvhFaVI//pwyvwCcCeXGZldfnDpKwAmgFDaal6mC0qV1szZl7Vtl0sGptMt1\n\tDbajBJS158SMO3UrfOXfnO68kWQ28HHre9jmYR6pWlCRp1Mc0QtoWlJwoQktBCzdap\n\tX/i9RY9czplUmG/vO3yki4aw4gO89oF7RErawHhY="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=gmx.net header.i=@gmx.net\n\theader.b=\"iD7sttvh\"; dkim-atps=neutral","X-UI-Sender-Class":"01bb95c1-4bf8-414a-932a-4f6e2808ef9c","Message-ID":"<83a11c1c-c9a9-3aa7-30f4-5c0d257483b9@gmx.de>","Date":"Thu, 6 Oct 2022 20:18:55 +0200","MIME-Version":"1.0","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101\n\tThunderbird/102.2.2","References":"<20220922202213.582824-1-Rauch.Christian@gmx.de>","Content-Language":"en-GB","To":"libcamera devel ","In-Reply-To":"<20220922202213.582824-1-Rauch.Christian@gmx.de>","X-Forwarded-Message-Id":"<20220922202213.582824-1-Rauch.Christian@gmx.de>","Content-Type":"text/plain; charset=UTF-8; format=flowed","Content-Transfer-Encoding":"quoted-printable","X-Provags-ID":"V03:K1:iANQ2c4vJMsjRh+OxYi3ynTeyHi32mNdMH44ACD95m+Z+Jejm8J\n\tlP1MsL3dTqv08W1b6gPJUbwSJ6Eh7q/+DZ5MfmBXLjo65gQqDrnsGtiEYSMoDU/k0Fnvk3G\n\tTpWBaead7F/WlBHfB+nF4HMbCkuhWmEEngtekJO3Hjc4e0Lf8gIaEyNVv93gkyyecF1F09I\n\tJDI0W/uVbCEcP7cDAwQ1A==","X-Spam-Flag":"NO","X-UI-Out-Filterresults":"notjunk:1; V03:K0:Y5A8uw5m5IA=:3d14WnGDnPPeVz4clj65WR\n\tD8+gPJ67Fl5lHzS9jIyoPzCBuH1noD3JwW8cm6hNcCD+ma0S0dUBu1DLkWMtmGr5qrzG+/x7X\n\t1m11U5r1hdEceG0D2H/YOOkCxw8dPEEWdl4ZOLvzAYen6imtnrRt9CHTx3jxyIud6ddwSw0Sv\n\tAWg5SME4xmV4Ohae8TsOB5XuIdQ96617NfQYeRaxXn+906OLSMuXcXwnBpM3OOIuk5mi/mbQD\n\tnVbhlno+r4O9bbYKMRhrxHi7TftUDbC+Et4Mz49uXm4IqYkjvCJcTdkbJSag9mVCcHaCy4UGG\n\tCHcJpX4Y17s4o9PhvsQ81Shdm5htOdG+j3tB5hqjQbNaLOIS+BZPFn0RNwA3IOQlOK4Cc+8s3\n\t5/3jsMJ85dQALXOvZWtQX90oGf61tlvkRRU/hrP8Yp9Y3EYBzBjNWuYzA4rvguFOod44qKd24\n\t2dQxe9ktQPXY0n2S6bNooCwRuV6w/HDYBolrAGcYbEPxZw8mcaL/gNX6i+smXV5qAiOXgJ3N9\n\t2+0tqaMeLWl/M/rl+DjLIJcPdmj4FkUsCrQIapsYJs4hRpVja9FRr0kKwoTIPgWNPHzHJB3MS\n\t83399LaVN83PVODd05mpatdsXEkGwvR1Q2z3iyWpnV9/4lMt6M1XD2014hJktQDUZ1Hm8UodF\n\tOPB1oEuZGkH2+9pIPXmp3PuPYkmw6e7xeSfTCA/adfarckJQ+sB6gm8fGWlFFlEYnIH9izALb\n\tKlsQwFPDk5ZPoPi9cQVNXQYfP9Dzw3AGwyyn6iisH2sF3F6roCNAFPhFE1QZS/AnJF8oUkQve\n\tPpm0+JemRbUU5+HsHqIvKraJWRsKbpNtKIATQjMHicNKHlyAmUkGV2dSl+POflut9gLBSccPY\n\tcyHk1Cuwza7euXYdQmzJ75pRqcu4WotMfd4Yg03mDiGq4j9SphDHZPrZVKM2kL39TNI6LtPgQ\n\tqKVLo4rGLVk+KC0lAFM//T3VuPt1x/yOAghOTCCYvv/GeGb6/1cOt/zY9pK/XYHl23KpoSChS\n\tM//TOIlpb0N/0IC72LyswcDVqWULyY4wo/MWqJhCQgnsMI2R7K4HuJq231wwjiZsXijeuk+e9\n\tHl0gRJ1W+K/THTjV5R+4UTSZ9P5E52lnfOHObUqojNRc1YL5JJs9Rf2Nd8OfHYMhxRlfz0rcz\n\tAosZfzu5+sPPSkvnTiETkbLhCwnz/ECw24jofiFxCaE+UDDJ7VzhdH3FEZj0ZZcPsFMROw5Yu\n\tPma0wrkF8WewZh6xKgVyH+U023PHeHOSkNaikt7f0DkXWaOPRP0zEsqKWFuYK7+GX5pNWP9TH\n\tE2HbVH7rHWeN6st8MkDDRa/ImamKXxHysx5EqFD9hIrRkBLHQhf+L9XO3qVu7EGBgQpLvCidI\n\tsfwOx6U8LeRmNiOpXD6ztt7Rpd8R2J5nyKc9lR9o7SAI25WI2DpACN68WB4N5NNuz73PDeGg9\n\tf7PrDY0/BkIhmeVoDTrSGgu6PVVYtkUr+of2Hv8y44B1EAEDet3brM/njGbt1KN+a7MfARCkD\n\tl++7YooQCHUUKCzLiJVXF/dNwqdic2C5qbA/mH0kSEb53","Subject":"[libcamera-devel] Fwd: [PATCH v3] libcamera: controls: validate all\n\tControlInfo values","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Christian Rauch via libcamera-devel\n\t","Reply-To":"Christian Rauch ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Hi,\n\nI am just forwarding this again to see if there is more feedback or\ninterest in merging this in the medium-term.\n\nBest,\nChristian\n\n\n-------- Weitergeleitete Nachricht --------\nBetreff: [PATCH v3] libcamera: controls: validate all ControlInfo values\nDatum: Thu, 22 Sep 2022 22:22:13 +0200\nVon: Christian Rauch \nAn: libcamera-devel@lists.libcamera.org\nKopie (CC): Christian Rauch , Kieran Bingham\n\n\nControlInfoMap::validate only checks the 'min' type against the ControlId\ntype. Extend this with checks against the 'max' type and the 'def' type,\nif a default is specified. This forces the min/max bounds to have the same\ntype as the controlled value, but leaves the default optional.\n\nSigned-off-by: Christian Rauch \nReviewed-by: Kieran Bingham \n---\n src/libcamera/controls.cpp | 25 ++++++++++++++++++++++++-\n 1 file changed, 24 insertions(+), 1 deletion(-)\n\n--\n2.34.1","diff":"diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\nindex bc3db4f6..1e54a712 100644\n--- a/src/libcamera/controls.cpp\n+++ b/src/libcamera/controls.cpp\n@@ -701,9 +701,32 @@ bool ControlInfoMap::validate()\n \t\t\t\t ? ControlTypeInteger32 : id->type();\n \t\tconst ControlInfo &info = ctrl.second;\n\n+\t\tif (!(info.min().isArray() == info.max().isArray() &&\n+\t\t info.min().numElements() == info.max().numElements())) {\n+\t\t\tLOG(Controls, Error)\n+\t\t\t\t<< \"Control \" << id->name()\n+\t\t\t\t<< \" range must have the same dimension.\";\n+\t\t\treturn false;\n+\t\t}\n+\n+\t\tif (info.min().type() != info.max().type()) {\n+\t\t\tLOG(Controls, Error)\n+\t\t\t\t<< \"Control \" << id->name()\n+\t\t\t\t<< \" range types mismatch\";\n+\t\t\treturn false;\n+\t\t}\n+\n+\t\tif (info.def().type() != ControlTypeNone &&\n+\t\t\tinfo.min().type() != info.def().type()) {\n+\t\t\tLOG(Controls, Error)\n+\t\t\t\t<< \"Control \" << id->name()\n+\t\t\t\t<< \" default value and info type mismatch\";\n+\t\t\treturn false;\n+\t\t}\n+\n \t\tif (info.min().type() != rangeType) {\n \t\t\tLOG(Controls, Error)\n-\t\t\t\t<< \"Control \" << utils::hex(id->id())\n+\t\t\t\t<< \"Control \" << id->name()\n \t\t\t\t<< \" type and info type mismatch\";\n \t\t\treturn false;\n \t\t}\n","prefixes":["libcamera-devel"]}