From patchwork Thu Dec 9 12:04:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 12695463 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B0F58C433EF for ; Thu, 9 Dec 2021 12:06:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=2cTC+i9qu6JxPzL7y8QFV5mORHkOH5ai1BullERoxtQ=; b=Dbp+PbTxXlVWwB XZWsv4xAHxy/ifVkLqcqe4wySB9iQ01byIwP6Mq4DXYqrsyqiO3yILG4LB7Ic5iuxJ/anxz2qHWoh 61SSf8iwZRuonJC2tKVsW8wkZ/oJChg1WDcOw6H2kVVGoTgZh9YJre4t9XuXB8yKMd7GJUU45HJeN hWxtEtiIyaNSW+91++PVRiI1+/ay8yL47TyMP6Cyvv1NHFPOtMrlhMybIvHK13QqL+iwDV8X9H4/5 6miQRnF8cRrMXkVLWipyNNnJ2FXrrz+abuK4N+mRv8F52VvFfbxyU8FRTI6E591uYPGx/ujwvNyFU 4dLaSNiuuJfoTc8z0Vvg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mvIAi-00FsKE-KE; Thu, 09 Dec 2021 12:05:12 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mvIAe-00FsJG-SY for linux-arm-kernel@lists.infradead.org; Thu, 09 Dec 2021 12:05:10 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id BDC872B; Thu, 9 Dec 2021 04:05:05 -0800 (PST) Received: from usa.arm.com (e103737-lin.cambridge.arm.com [10.1.197.49]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 9AB583F5A1; Thu, 9 Dec 2021 04:05:04 -0800 (PST) From: Sudeep Holla To: linux-kernel@vger.kernel.org, soc@kernel.org, arm@kernel.org Cc: Sudeep Holla , linux-arm-kernel@lists.infradead.org, stable@vger.kernel.org, Pedro Batista , Cristian Marussi Subject: [PATCH v2] firmware: arm_scpi: Fix string overflow in SCPI genpd driver Date: Thu, 9 Dec 2021 12:04:56 +0000 Message-Id: <20211209120456.696879-1-sudeep.holla@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211209_040509_015658_BFB589D7 X-CRM114-Status: GOOD ( 11.90 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Without the bound checks for scpi_pd->name, it could result in the buffer overflow when copying the SCPI device name from the corresponding device tree node as the name string is set at maximum size of 30. Let us fix it by using devm_kasprintf so that the string buffer is allocated dynamically. Cc: stable@vger.kernel.org Fixes: 8bec4337ad40 ("firmware: scpi: add device power domain support using genpd") Reported-by: Pedro Batista Cc: Cristian Marussi Signed-off-by: Sudeep Holla --- drivers/firmware/scpi_pm_domain.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) Hi ARM SoC team, Can you apply this directly as I don't have any other fix at the moment. Regards, Sudeep v1->v2: - Fixed accidentally dropped '.' in the name - Used devm_kasprintf instead of combination of kasprintf and devm_kstrdup v1: https://lore.kernel.org/r/20211206153150.565685-1-sudeep.holla@arm.com/ -- 2.25.1 diff --git a/drivers/firmware/scpi_pm_domain.c b/drivers/firmware/scpi_pm_domain.c index 51201600d789..800673910b51 100644 --- a/drivers/firmware/scpi_pm_domain.c +++ b/drivers/firmware/scpi_pm_domain.c @@ -16,7 +16,6 @@ struct scpi_pm_domain { struct generic_pm_domain genpd; struct scpi_ops *ops; u32 domain; - char name[30]; }; /* @@ -110,8 +109,13 @@ static int scpi_pm_domain_probe(struct platform_device *pdev) scpi_pd->domain = i; scpi_pd->ops = scpi_ops; - sprintf(scpi_pd->name, "%pOFn.%d", np, i); - scpi_pd->genpd.name = scpi_pd->name; + scpi_pd->genpd.name = devm_kasprintf(dev, GFP_KERNEL, + "%pOFn.%d", np, i); + if (!scpi_pd->genpd.name) { + dev_err(dev, "Failed to allocate genpd name:%pOFn.%d\n", + np, i); + continue; + } scpi_pd->genpd.power_off = scpi_pd_power_off; scpi_pd->genpd.power_on = scpi_pd_power_on;