{"id":17365,"url":"https://patchwork.libcamera.org/api/patches/17365/?format=json","web_url":"https://patchwork.libcamera.org/patch/17365/","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":"<20220912205705.83029-1-Rauch.Christian@gmx.de>","date":"2022-09-12T20:57:05","name":"[libcamera-devel] libcamera: controls: validate all ControlInfo values","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"197d1878dd343cc6ba67aa7c9f0a398a3fc988c5","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/17365/mbox/","series":[{"id":3484,"url":"https://patchwork.libcamera.org/api/series/3484/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3484","date":"2022-09-12T20:57:05","name":"[libcamera-devel] libcamera: controls: validate all ControlInfo values","version":1,"mbox":"https://patchwork.libcamera.org/series/3484/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/17365/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/17365/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 9CE87C0DA4\n\tfor ;\n\tMon, 12 Sep 2022 20:57:10 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C2A6E61FA0;\n\tMon, 12 Sep 2022 22:57:09 +0200 (CEST)","from mout.gmx.net (mout.gmx.net [212.227.15.18])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A025D609A6\n\tfor ;\n\tMon, 12 Sep 2022 22:57:08 +0200 (CEST)","from voyager ([88.152.184.103]) by mail.gmx.net (mrgmx005\n\t[212.227.17.190]) with ESMTPSA (Nemesis) id 1MRTN9-1ojiTZ0VBl-00NUNN;\n\tMon, 12 Sep 2022 22:57:08 +0200"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1663016229;\n\tbh=W3QBKQVFpd01YQgeD3z0VFP06YZcTQmsSfMLjNJdewM=;\n\th=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post:\n\tList-Help:List-Subscribe:From:Reply-To:From;\n\tb=0ce8PUOJHketRPD1O5GykQJA4obunP3WabxAWx5vv4ZAPjDUpMCAd2y3ysmp0hPTP\n\tEf3BuRAB0dkEdGx5fxU2mHaEaM2h4nqrWhhtkc/tQhUStgsCYh9/Jf+843g6qUa7Fr\n\t7ug4YPvG2qL+9Yvq9mTZq4i0ulHm86YSab6S8tKdNIp1u96nzkaFT9G49JA04NDHFv\n\t7+tgLbMOOdad24NLeONmAfebW8IqJR8lyimXiLaELrWVp5oh/vZL8hQjO+LdPLq0ok\n\tQD1HDuLy8crTW/mRkrLQ3I4wUZ2QYVX1fsTykeudFq5/oFSi8i8poPIZoew5l38owp\n\t1pIg7BjVB3rbQ==","v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;\n\ts=badeba3b8450; t=1663016228;\n\tbh=W3QBKQVFpd01YQgeD3z0VFP06YZcTQmsSfMLjNJdewM=;\n\th=X-UI-Sender-Class:From:To:Cc:Subject:Date;\n\tb=CZQsq0qcd67ksFKBgMxwp+QLGwQfdxxLV6WtkqWGQi5OHoltnNx+BWv8Vi3Hf1o8e\n\tj4edWwhBzaDATakPG1EHfv3trq9rGBZ6D+ICoO+WVtCInj1qEW3+Q2ajb6v5rlZuyx\n\tXm1xEzMokxlIAKAEs+TeFFBxYdimUWF9RKHuqWwM="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=gmx.net header.i=@gmx.net\n\theader.b=\"CZQsq0qc\"; dkim-atps=neutral","X-UI-Sender-Class":"01bb95c1-4bf8-414a-932a-4f6e2808ef9c","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 12 Sep 2022 22:57:05 +0200","Message-Id":"<20220912205705.83029-1-Rauch.Christian@gmx.de>","X-Mailer":"git-send-email 2.34.1","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","X-Provags-ID":"V03:K1:wMb9Sr6qMcV0XCFFVJNjcdFZKvd6657m48Itj4sz2qQrDGTm6Vv\n\tX13QFlaOaMP3hYv2LMX7kjFda5ffzCDvsxpyH5EzTkes/SsUwiz6kyKHpNRcyJ8QgrkiggI\n\t3jcqxMbEc3e0OeHEdS5cR95jWHayAsiuFHTtxYzwNe+cFaIvVR8L/tWjJEUmxvWWsNYnZEi\n\tidyqtV6pQusGPifdVC0EA==","X-Spam-Flag":"NO","X-UI-Out-Filterresults":"notjunk:1; V03:K0:ZxsYpDIcl3o=:vjZ9alcazlkXWHH/Eif18M\n\tiTEI3ic8QMUJm2o7Hg7QPRFVgNc58yA0nIRYqkHlEnJNHz5Xyxei0x5p1Px8TjDGZdYYgqmrE\n\tmGgBZKWy4L6a3xILCOfAFTw17nPzFmFMzOFeBtknJToqH4mQ9N5ekMCGqz3Op5e5mIDnxrIE7\n\thkSxggrTeaGia8iKdBeGUJ0itx6aPcjo5CtkwoYul0IwfCDxKrC/1E9YCmqzaA9w0C9TM0olL\n\tA9QGmnYZr2G9YTERozLE9vd2LnlDFNOWAZNxs69tfyZf17ACQNW9K+NZTcQs2yjxgREoVplr4\n\taBSaZLiRX9J4Ur4xIkwx/E+xLeY6KbU573uz3lkpMGXGxU7EEJt6c0LkGrIOf3OV07Ru47m5o\n\t/l03/L3TdhChTc62fNX0RBKuj31aecUVFF756Ue0K0ty/QUXhwju8S6IrW9UUgB6rIcS/34pO\n\tSS+pbCHg0KLQFpRhldWoJVqyc8UgrYUfaalOWQVRVXZQirarxE5BWAb04NCbRVSSDzeHrD+SC\n\t7Wku2GeSdteXfKHF4eeDyRnn8QkIhXYG7c3hBEG+oheG2Jd0Qi+4SdGfD5j4QzVZTKdQPF6yy\n\t1IuxvNVAS9YNrgDsN1vT+FnW/uPYXNxDIdk9063+Jx5Ph2hQx5ZRoLtbd7k3IeLxlI8DXozve\n\tRismC1OGX/i+rrl9gnkS5AaLsEtWbgezbdMni+JFyCaniC5tIRijdepYi+qvZAh7I0UYJMbks\n\tqHzPgiIpQe+oU/3R78CRllHrKE3NtASgWpVuAUVc8unao3epmWoADd8A6PLPPaA25TcTeHQ0j\n\tRMKqoN//5UBe0Lc2in0j8BfgehqLpxDxRyMIeK+59/Mr3azGO4MM/uHAohPRIQIVM3AsRJ1b5\n\tqKQM9Pv9O/SlN0Gi5Np3fC+ToJm15SXfEENBfj2WNAMj4MhfSze9uQxOZ2nOIBNQ003ck7EK6\n\tKbQu4aFwXONH1NnOEzqGF1QQmwbguWmHz/F3yECV52I15cI6VXmu0JhgctnChvNMVfzxO79kY\n\t/nakcgEG+m/wakwTGdtvzAHJyj6k13KTMn0UHOcK9z5Er+jM+W3OXsQdR/qiQqd1cshBzxURo\n\tbAe+FUfK6VxOLz4TScRmsIIfkgPSSqNRVZuxnorj6b/aO8bjRF/t7tSaOY1kdzG+MIeKsaQoF\n\ta8IrFLohvZxl25Jkgvm2oEbZup","Subject":"[libcamera-devel] [PATCH] 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":"ControlInfoMap::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 \n---\n src/libcamera/controls.cpp | 14 ++++++++++++++\n 1 file changed, 14 insertions(+)\n\n--\n2.34.1","diff":"diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\nindex bc3db4f6..040257c5 100644\n--- a/src/libcamera/controls.cpp\n+++ b/src/libcamera/controls.cpp\n@@ -701,6 +701,20 @@ bool ControlInfoMap::validate()\n \t\t\t\t ? ControlTypeInteger32 : id->type();\n \t\tconst ControlInfo &info = ctrl.second;\n\n+\t\tif (info.min().type() != info.max().type()) {\n+\t\t\tLOG(Controls, Error)\n+\t\t\t\t<< \"Control \" << utils::hex(id->id())\n+\t\t\t\t<< \" range types mismatch\";\n+\t\t\treturn false;\n+\t\t}\n+\n+\t\tif (info.def().type() != ControlTypeNone && (info.min().type() != info.def().type())) {\n+\t\t\tLOG(Controls, Error)\n+\t\t\t\t<< \"Control \" << utils::hex(id->id())\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","prefixes":["libcamera-devel"]}