[{"id":23453,"web_url":"https://patchwork.libcamera.org/comment/23453/","msgid":"<20220617140717.rafhpco4rd7ytypu@uno.localdomain>","date":"2022-06-17T14:07:17","subject":"Re: [libcamera-devel] [PATCH 6/7] libcamera: yaml_parser: Fix range\n\tchecks for 32-bit integers","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Laurent\n\nOn Thu, Jun 16, 2022 at 05:24:02PM +0300, Laurent Pinchart via libcamera-devel wrote:\n> The strtol() and strtoul() functions return long integers, which may be\n> larger than 32-bit integers. Add manual range checks.\n>\n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n> ---\n> src/libcamera/yaml_parser.cpp | 13 +++++++++----\n> 1 file changed, 9 insertions(+), 4 deletions(-)\n>\n> diff --git a/src/libcamera/yaml_parser.cpp b/src/libcamera/yaml_parser.cpp\n> index 9b6e70cbfcf3..bd4b501b1422 100644\n> --- a/src/libcamera/yaml_parser.cpp\n> +++ b/src/libcamera/yaml_parser.cpp\n> @@ -10,6 +10,7 @@\n> #include \n> #include \n> #include \n> +#include \n>\n> #include \n> #include \n> @@ -151,9 +152,11 @@ int32_t YamlObject::get(const int32_t &defaultValue, bool *ok) const\n> \tchar *end;\n>\n> \terrno = 0;\n> -\tint32_t value = std::strtol(value_.c_str(), &end, 10);\n\nOr should value be a long instead ?\n\n> +\tlong value = std::strtol(value_.c_str(), &end, 10);\n>\n> -\tif ('\\0' != *end || errno == ERANGE)\n> +\tif ('\\0' != *end || errno == ERANGE ||\n> +\t value < std::numeric_limits::min() ||\n> +\t value > std::numeric_limits::max())\n> \t\treturn defaultValue;\n>\n> \tsetOk(ok, true);\n> @@ -185,9 +188,11 @@ uint32_t YamlObject::get(const uint32_t &defaultValue, bool *ok) const\n> \tchar *end;\n>\n> \terrno = 0;\n> -\tuint32_t value = std::strtoul(value_.c_str(), &end, 10);\n> +\tunsigned long value = std::strtoul(value_.c_str(), &end, 10);\n>\n> -\tif ('\\0' != *end || errno == ERANGE)\n> +\tif ('\\0' != *end || errno == ERANGE ||\n> +\t value < std::numeric_limits::min() ||\n> +\t value > std::numeric_limits::max())\n> \t\treturn defaultValue;\n>\n> \tsetOk(ok, true);\n> --\n> Regards,\n>\n> Laurent Pinchart\n>","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 270E7BD808\n\tfor ;\n\tFri, 17 Jun 2022 14:07:21 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 700B565635;\n\tFri, 17 Jun 2022 16:07:20 +0200 (CEST)","from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net\n\t[IPv6:2001:4b98:dc4:8::228])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2782C65632\n\tfor ;\n\tFri, 17 Jun 2022 16:07:19 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby mail.gandi.net (Postfix) with ESMTPSA id 952BA1BF212;\n\tFri, 17 Jun 2022 14:07:18 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1655474840;\n\tbh=YLPvlPvmWx3J+l/UjSc1ar5HwKTl9PPpjCj0klbb2TQ=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=RH2uIRt07logKNn4t/LVy8b44m8cL1wS/5Vv4P60Q56Yf/bRs78WbwtZRRRLHofZI\n\tQMrx5rz/2bKmTw0pHSXWb85Q3+FYqEWnG1iKKN58Ma0M+SOMxghQU7XyQNVBBvKTb2\n\tEycD4VDOa89SFQBXaJ3/A0je+O1pQPBk7t+8EkVRNACtUyE3hC8Qfwgo5fMJZXiuKh\n\tvEWKv0djsAhx/j6YywuwmL5nfj6pAjJzl9mOphi9ee0PQtz3MlVyBQZ0oYYPzf6n3Q\n\tdR3YPewsvDP+PTV4ZyQu/HtKGUB372wFoU70Vvkq3BhAi5esIk8zJyohH5OGluMq9/\n\tqfdrXx1o7e0uw==","Date":"Fri, 17 Jun 2022 16:07:17 +0200","To":"Laurent Pinchart ","Message-ID":"<20220617140717.rafhpco4rd7ytypu@uno.localdomain>","References":"<20220616142403.20723-1-laurent.pinchart@ideasonboard.com>\n\t<20220616142403.20723-7-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20220616142403.20723-7-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 6/7] libcamera: yaml_parser: Fix range\n\tchecks for 32-bit integers","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":"Jacopo Mondi via libcamera-devel ","Reply-To":"Jacopo Mondi ","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":23454,"web_url":"https://patchwork.libcamera.org/comment/23454/","msgid":"<20220617140924.dbdfbmrsnklfnhn3@uno.localdomain>","date":"2022-06-17T14:09:24","subject":"Re: [libcamera-devel] [PATCH 6/7] libcamera: yaml_parser: Fix range\n\tchecks for 32-bit integers","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Ahem\n\nOn Fri, Jun 17, 2022 at 04:07:17PM +0200, Jacopo Mondi via libcamera-devel wrote:\n> Hi Laurent\n>\n> On Thu, Jun 16, 2022 at 05:24:02PM +0300, Laurent Pinchart via libcamera-devel wrote:\n> > The strtol() and strtoul() functions return long integers, which may be\n> > larger than 32-bit integers. Add manual range checks.\n> >\n> > Signed-off-by: Laurent Pinchart \n>\n> Reviewed-by: Jacopo Mondi \n>\n> Thanks\n> j\n>\n> > ---\n> > src/libcamera/yaml_parser.cpp | 13 +++++++++----\n> > 1 file changed, 9 insertions(+), 4 deletions(-)\n> >\n> > diff --git a/src/libcamera/yaml_parser.cpp b/src/libcamera/yaml_parser.cpp\n> > index 9b6e70cbfcf3..bd4b501b1422 100644\n> > --- a/src/libcamera/yaml_parser.cpp\n> > +++ b/src/libcamera/yaml_parser.cpp\n> > @@ -10,6 +10,7 @@\n> > #include \n> > #include \n> > #include \n> > +#include \n> >\n> > #include \n> > #include \n> > @@ -151,9 +152,11 @@ int32_t YamlObject::get(const int32_t &defaultValue, bool *ok) const\n> > \tchar *end;\n> >\n> > \terrno = 0;\n> > -\tint32_t value = std::strtol(value_.c_str(), &end, 10);\n>\n> Or should value be a long instead ?\n>\n\nWrote this before realizing this was a specialization and forgot to delete\nthe comment!\n\nThanks\n j\n\n> > +\tlong value = std::strtol(value_.c_str(), &end, 10);\n> >\n> > -\tif ('\\0' != *end || errno == ERANGE)\n> > +\tif ('\\0' != *end || errno == ERANGE ||\n> > +\t value < std::numeric_limits::min() ||\n> > +\t value > std::numeric_limits::max())\n> > \t\treturn defaultValue;\n> >\n> > \tsetOk(ok, true);\n> > @@ -185,9 +188,11 @@ uint32_t YamlObject::get(const uint32_t &defaultValue, bool *ok) const\n> > \tchar *end;\n> >\n> > \terrno = 0;\n> > -\tuint32_t value = std::strtoul(value_.c_str(), &end, 10);\n> > +\tunsigned long value = std::strtoul(value_.c_str(), &end, 10);\n> >\n> > -\tif ('\\0' != *end || errno == ERANGE)\n> > +\tif ('\\0' != *end || errno == ERANGE ||\n> > +\t value < std::numeric_limits::min() ||\n> > +\t value > std::numeric_limits::max())\n> > \t\treturn defaultValue;\n> >\n> > \tsetOk(ok, true);\n> > --\n> > Regards,\n> >\n> > Laurent Pinchart\n> >","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 AB79FBD808\n\tfor ;\n\tFri, 17 Jun 2022 14:09:27 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 25A2765635;\n\tFri, 17 Jun 2022 16:09:27 +0200 (CEST)","from relay10.mail.gandi.net (relay10.mail.gandi.net\n\t[IPv6:2001:4b98:dc4:8::230])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 873D365632\n\tfor ;\n\tFri, 17 Jun 2022 16:09:26 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby mail.gandi.net (Postfix) with ESMTPSA id 074D224000D;\n\tFri, 17 Jun 2022 14:09:25 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1655474967;\n\tbh=I2WB3CUcVpwmZ6jFzDi+OhhWmBZnen8mtKxkUF4GU04=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=4iCevAm4ZarVg4Ryh/KC3Dv4UGa3f32/90rAwUp2WyvrUjwX6ZIhG+yw4rMAHkYTw\n\tNZ7jYfChWwGUk98lIYhUYlUluKQqztnVm2Ki6jnD/uUqVyfZBZMv/IJ6Tk8uTJm2w4\n\te2rnlzrDMjopHLevyr1DNCvdSuXJk2KdXWNfuUty+Y65AqvQFBaxM5/OqpcF8eEg5M\n\t6pzPuuiuqZZMnvfNjJt+QFJZHRIHBOavpTwPHhAj9RWjS38PGd6aq1MThn97gMoBlV\n\tkRqWcSaFGcmqpbqDtXEe8kKgh9dW/P9Wb2j0r74q9gjShoZG4so1t0muMUbcUtpK1K\n\thw7YlHEsjCAww==","Date":"Fri, 17 Jun 2022 16:09:24 +0200","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","Message-ID":"<20220617140924.dbdfbmrsnklfnhn3@uno.localdomain>","References":"<20220616142403.20723-1-laurent.pinchart@ideasonboard.com>\n\t<20220616142403.20723-7-laurent.pinchart@ideasonboard.com>\n\t<20220617140717.rafhpco4rd7ytypu@uno.localdomain>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20220617140717.rafhpco4rd7ytypu@uno.localdomain>","Subject":"Re: [libcamera-devel] [PATCH 6/7] libcamera: yaml_parser: Fix range\n\tchecks for 32-bit integers","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":"Jacopo Mondi via libcamera-devel ","Reply-To":"Jacopo Mondi ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":23481,"web_url":"https://patchwork.libcamera.org/comment/23481/","msgid":"","date":"2022-06-20T11:48:38","subject":"Re: [libcamera-devel] [PATCH 6/7] libcamera: yaml_parser: Fix range\n\tchecks for 32-bit integers","submitter":{"id":98,"url":"https://patchwork.libcamera.org/api/people/98/","name":"Hanlin Chen","email":"hanlinchen@chromium.org"},"content":"Hi Laurent\n\nOn Thu, Jun 16, 2022 at 05:24:02PM +0300, Laurent Pinchart via\nlibcamera-devel wrote:\n> The strtol() and strtoul() functions return long integers, which may be\n> larger than 32-bit integers. Add manual range checks.\n>\n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Han-Lin Chen \n\nThanks for the fix!\n\nOn Thu, Jun 16, 2022 at 10:24 PM Laurent Pinchart via libcamera-devel\n wrote:\n>\n> The strtol() and strtoul() functions return long integers, which may be\n> larger than 32-bit integers. Add manual range checks.\n>\n> Signed-off-by: Laurent Pinchart \n> ---\n> src/libcamera/yaml_parser.cpp | 13 +++++++++----\n> 1 file changed, 9 insertions(+), 4 deletions(-)\n>\n> diff --git a/src/libcamera/yaml_parser.cpp b/src/libcamera/yaml_parser.cpp\n> index 9b6e70cbfcf3..bd4b501b1422 100644\n> --- a/src/libcamera/yaml_parser.cpp\n> +++ b/src/libcamera/yaml_parser.cpp\n> @@ -10,6 +10,7 @@\n> #include \n> #include \n> #include \n> +#include \n>\n> #include \n> #include \n> @@ -151,9 +152,11 @@ int32_t YamlObject::get(const int32_t &defaultValue, bool *ok) const\n> char *end;\n>\n> errno = 0;\n> - int32_t value = std::strtol(value_.c_str(), &end, 10);\n> + long value = std::strtol(value_.c_str(), &end, 10);\n>\n> - if ('\\0' != *end || errno == ERANGE)\n> + if ('\\0' != *end || errno == ERANGE ||\n> + value < std::numeric_limits::min() ||\n> + value > std::numeric_limits::max())\n> return defaultValue;\n>\n> setOk(ok, true);\n> @@ -185,9 +188,11 @@ uint32_t YamlObject::get(const uint32_t &defaultValue, bool *ok) const\n> char *end;\n>\n> errno = 0;\n> - uint32_t value = std::strtoul(value_.c_str(), &end, 10);\n> + unsigned long value = std::strtoul(value_.c_str(), &end, 10);\n>\n> - if ('\\0' != *end || errno == ERANGE)\n> + if ('\\0' != *end || errno == ERANGE ||\n> + value < std::numeric_limits::min() ||\n> + value > std::numeric_limits::max())\n> return defaultValue;\n>\n> setOk(ok, true);\n> --\n> Regards,\n>\n> Laurent Pinchart\n>","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 4B1E6BE173\n\tfor ;\n\tMon, 20 Jun 2022 11:48:53 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 51A2E65635;\n\tMon, 20 Jun 2022 13:48:52 +0200 (CEST)","from mail-oa1-x35.google.com (mail-oa1-x35.google.com\n\t[IPv6:2001:4860:4864:20::35])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 09D4A60498\n\tfor ;\n\tMon, 20 Jun 2022 13:48:50 +0200 (CEST)","by mail-oa1-x35.google.com with SMTP id\n\t586e51a60fabf-101cdfddfacso5790613fac.7\n\tfor ;\n\tMon, 20 Jun 2022 04:48:49 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1655725732;\n\tbh=owXK1duoTHDwiFjyEtfXIx7q8pQLm0R1XkMe8UmHKtQ=;\n\th=References:In-Reply-To:Date:To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=R+JAYlQnxA0nLN6qKBVWsega+lsjE8sy1qEl3+vKTOYNiwyh9yElbITX8+JN1BnX3\n\t2v00JHFjgH/+1iRXc/CzQ4ppEgCNMcJz5aKee5gO79nfP8NEs7Z4i8he1g2Zb4YSlu\n\tAOkhpRQykEgfnxNozyRJUb2vhuQmrVCYl+oM9HMpvdgcVrgmaKeaXKRJhQASPmgk6Q\n\tHkh5TLUnR0acgQoRTLhsI7/EctxEB+VVUl9uU6XBF5QQAyzZwX9nAqvFtPTUEnskf0\n\t92IauEh7xEGNdkGrPCdOuCUN9OVEoSswo1gwEyKertjou7DBfu7Jp/mP1nnpDQlvnh\n\tLi/dXKspxfaPA==","v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=mime-version:references:in-reply-to:from:date:message-id:subject:to\n\t:cc; bh=QiLyZ7Ix0yBjPNOVwsIhzdsaa5pgTq604v3CKOWZqb0=;\n\tb=gDdnEF3TLXbGW+dl+OLX02vfgxXvadacHsqeaxTmcB9j21MtCD8lI/vaWpLAuI6lLY\n\ts+E0p/27xvWFEd7LC7s80grRKPmqh70VTfmH5lj/Gi8qDpv7UFJ4OAtDBdYNC0LcyJtJ\n\tbAzarvrrImzsatXJndHWcHmc3RmnfwNhwtSp8="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=chromium.org\n\theader.i=@chromium.org header.b=\"gDdnEF3T\"; \n\tdkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:mime-version:references:in-reply-to:from:date\n\t:message-id:subject:to:cc;\n\tbh=QiLyZ7Ix0yBjPNOVwsIhzdsaa5pgTq604v3CKOWZqb0=;\n\tb=SGZG/VSX/B1GvcszRDyOPqksDGn6IAp/c7ua9NwKCViGGPklvNlGIGpYGF8it6wtn+\n\tN44O17vGPzaIMK1QPms5Zzxzh77EbK26l6hUOLnTGWy77eSxtuARQcq07aXn23zi6YcB\n\tUusFUSiQJjW8ckradTP/VW1934MM0wgG9AAxBIhF1tBjsY58khPOwzDO29Mifx563UqP\n\tKH6+PGRvDXzRH6+wLP5Vgr02TLL+P88JxGIDpmUfKjojFf5MsGIESnddEyHjAQ+96HHE\n\tuLhjB+uh606TV20PSTOY2QM68ZnpaEbP1xtKJ3QweEOP1Xwohux8fIWdTdXfHjvTMZsV\n\tdnEA==","X-Gm-Message-State":"AJIora8AynVPIaQRWIoAQHDY6zVB3xdIdQeWqxJd/7UsH2Qz1cBRwgDu\n\tXsBcDJ70WeGJnkYDyzc3WRDfbztMG/e662VQKoWn5g==","X-Google-Smtp-Source":"AGRyM1uUdhrz3Rw0W2kngwsu1+I+3WwVZSZRchwHw+Dja+CuVDscdRjq/QlezC7q9If8EXJGooz3CE2JdafUNvxgogM=","X-Received":"by 2002:a05:6870:ea8e:b0:fe:251a:3c3d with SMTP id\n\ts14-20020a056870ea8e00b000fe251a3c3dmr18258204oap.62.1655725728672;\n\tMon, 20 Jun 2022 04:48:48 -0700 (PDT)","MIME-Version":"1.0","References":"<20220616142403.20723-1-laurent.pinchart@ideasonboard.com>\n\t<20220616142403.20723-7-laurent.pinchart@ideasonboard.com>","In-Reply-To":"<20220616142403.20723-7-laurent.pinchart@ideasonboard.com>","Date":"Mon, 20 Jun 2022 19:48:38 +0800","Message-ID":"","To":"Laurent Pinchart ","Content-Type":"text/plain; charset=\"UTF-8\"","Subject":"Re: [libcamera-devel] [PATCH 6/7] libcamera: yaml_parser: Fix range\n\tchecks for 32-bit integers","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":"Hanlin Chen via libcamera-devel ","Reply-To":"Hanlin Chen ","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]