[{"id":25474,"web_url":"https://patchwork.libcamera.org/comment/25474/","msgid":"<166618434473.2560709.18338640283094035588@Monstersaurus>","date":"2022-10-19T12:59:04","subject":"Re: [libcamera-devel] [PATCH v2 1/2] libcamera: base: log: Fix use\n\tof freed name","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Tomi Valkeinen via libcamera-devel (2022-08-29 09:44:44)\n> LogCategory just stores the char * that was given to it in the\n> constructor, i.e. it refers to memory \"outside\" LogCategory. If the\n> LogCategory is defined in a .so that is unloaded, then it leads to the\n> LogCategory pointing to freed memory, causing a crash.\n> \n> Fix this by taking a copy of the name by using a std::string instead of\n> just storing the pointer.\n> \n> Signed-off-by: Tomi Valkeinen \n> Reviewed-by: Laurent Pinchart \n\n\nReviewed-by: Kieran Bingham \n\n> ---\n> include/libcamera/base/log.h | 4 ++--\n> src/libcamera/base/log.cpp | 2 +-\n> 2 files changed, 3 insertions(+), 3 deletions(-)\n> \n> diff --git a/include/libcamera/base/log.h b/include/libcamera/base/log.h\n> index 3fc5ced3..8b462767 100644\n> --- a/include/libcamera/base/log.h\n> +++ b/include/libcamera/base/log.h\n> @@ -31,14 +31,14 @@ class LogCategory\n> public:\n> explicit LogCategory(const char *name);\n> \n> - const char *name() const { return name_; }\n> + const std::string &name() const { return name_; }\n> LogSeverity severity() const { return severity_; }\n> void setSeverity(LogSeverity severity);\n> \n> static const LogCategory &defaultCategory();\n> \n> private:\n> - const char *name_;\n> + const std::string name_;\n> LogSeverity severity_;\n> };\n> \n> diff --git a/src/libcamera/base/log.cpp b/src/libcamera/base/log.cpp\n> index 5c359a22..a4a5b452 100644\n> --- a/src/libcamera/base/log.cpp\n> +++ b/src/libcamera/base/log.cpp\n> @@ -568,7 +568,7 @@ void Logger::logSetLevel(const char *category, const char *level)\n> return;\n> \n> for (LogCategory *c : categories_) {\n> - if (!strcmp(c->name(), category)) {\n> + if (c->name() == category) {\n> c->setSeverity(severity);\n> break;\n> }\n> -- \n> 2.34.1\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 40943BD16B\n\tfor ;\n\tWed, 19 Oct 2022 12:59:10 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9450F62E5C;\n\tWed, 19 Oct 2022 14:59:09 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 09FF162DFA\n\tfor ;\n\tWed, 19 Oct 2022 14:59:08 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 708BE5A4;\n\tWed, 19 Oct 2022 14:59:07 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1666184349;\n\tbh=Rz+l/s4XCqnVFTlglQKJX/9/geJEqH8aRNeyJ+U3kSY=;\n\th=In-Reply-To:References:To:Date:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=NdtX8usxGyRPqQX1PwbF3ngmkwdX4eI6K9jbzloyasiXJghKfxoYh48z5qHuaQO6d\n\tnMGTQzKN+APEizR3kgRtCaUIgKsNxNOYuV6metpxtv9+QtpvvAeZBvruQDm6wsf3CS\n\tDWLgkAq3knssb00R2pjLzFz++M73RVlrbvBAq8K9Ffs+GODJNr2QaIv42sqU3OayEF\n\tPdJEn2oyhTSbtqEDcb9Ny+9n7eu4vw26h7DqzsAyrWvik2EHF2tKaNlxBFCQEK8c5M\n\tzAzqdie4BpCQ3fwbb3YKTopaikDnVa9e9kDXUqPqyBzNX6+Rbw31cid7b4CKUPVPLy\n\t3i2c/9azTMgIQ==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1666184347;\n\tbh=Rz+l/s4XCqnVFTlglQKJX/9/geJEqH8aRNeyJ+U3kSY=;\n\th=In-Reply-To:References:Subject:From:To:Date:From;\n\tb=L6OB+Nnd+qeHQMoQzdNdfVIU93R277qcuTpMHCVqVlJI8Rv0/uyB7uXVvCSBZwXC0\n\tA2AMlLyPM9oiJ5/RzQS7o5AKgy7Y5i6bhk8/4eNIRen1z5MuOZ9P8x3qUv3ugjiUEJ\n\tL5G2OU6K5kn+kAO9PImz8AdW7qhPYpPHJ1H0C0/o="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"L6OB+Nnd\"; dkim-atps=neutral","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20220829084445.61585-2-tomi.valkeinen@ideasonboard.com>","References":"<20220829084445.61585-1-tomi.valkeinen@ideasonboard.com>\n\t<20220829084445.61585-2-tomi.valkeinen@ideasonboard.com>","To":"Laurent Pinchart ,\n\tTomi Valkeinen ,\n\tlibcamera-devel ","Date":"Wed, 19 Oct 2022 13:59:04 +0100","Message-ID":"<166618434473.2560709.18338640283094035588@Monstersaurus>","User-Agent":"alot/0.10","Subject":"Re: [libcamera-devel] [PATCH v2 1/2] libcamera: base: log: Fix use\n\tof freed name","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":"Kieran Bingham via libcamera-devel\n\t","Reply-To":"Kieran Bingham ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]