From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AC06D216E3B; Thu, 12 Dec 2024 16:44:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734021890; cv=none; b=OKt1eOObgpRzpUuEb+SNvaba51s6WCsusnYC+lU5XK3rkoJtKaTSzbBjhwriSL1p7RTmo7sqOFtiUdcZqPpncwfAXYZjMugB0/E+yQH0Wx0VHUiA31xBcb8zGybif7Xr7pvc+30VfvqdIgOrbKyd10oqxBdMWSOV4G+rYjqI5Uw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734021890; c=relaxed/simple; bh=5PjyDJXYITON5/5ghFnnkrWCOUXG1ZErhj0ZOaomqyM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=K15y1wIcHofUbZ8Ud4nusvxqKah95LdVk1sNfFzYWweKMBve8nrsXEVyouyWRNCkcOKi7LiPXVgwtFRbutvyBjCjWgDjvmC34B0tk9S3cYrbbubPrMvyH7D3UsvlxqvF72+ugM913LJrFMfhn5G7LJix3D8XsStJahsHPT1Pbhg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hlLni0/z; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="hlLni0/z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1850BC4CECE; Thu, 12 Dec 2024 16:44:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734021890; bh=5PjyDJXYITON5/5ghFnnkrWCOUXG1ZErhj0ZOaomqyM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hlLni0/z4sIWsIKWccb+WIMs1K3AvzAYYS3ImovZYGJqorV5ra7gu/NxRq2EBNwmW Mithb/V8XppMoUckdLo/d3BAcEfcyMQFHzR/SHsWF8tszuzWCnjrFnhIF/h1VLGmOA uFg8GwzQtR3r9/IWcTnqptHDEe0if/NAIRSHzapM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Charles Han , Bjorn Andersson , Sasha Levin Subject: [PATCH 5.15 061/565] soc: qcom: Add check devm_kasprintf() returned value Date: Thu, 12 Dec 2024 15:54:16 +0100 Message-ID: <20241212144313.904754460@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144311.432886635@linuxfoundation.org> References: <20241212144311.432886635@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Charles Han [ Upstream commit e694d2b5c58ba2d1e995d068707c8d966e7f5f2a ] devm_kasprintf() can return a NULL pointer on failure but this returned value in qcom_socinfo_probe() is not checked. Signed-off-by: Charles Han Link: https://lore.kernel.org/r/20240929072349.202520-1-hanchunchao@inspur.com Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- drivers/soc/qcom/socinfo.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/soc/qcom/socinfo.c b/drivers/soc/qcom/socinfo.c index 5beb452f24013..491f33973aa0c 100644 --- a/drivers/soc/qcom/socinfo.c +++ b/drivers/soc/qcom/socinfo.c @@ -614,10 +614,16 @@ static int qcom_socinfo_probe(struct platform_device *pdev) qs->attr.revision = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%u.%u", SOCINFO_MAJOR(le32_to_cpu(info->ver)), SOCINFO_MINOR(le32_to_cpu(info->ver))); - if (offsetof(struct socinfo, serial_num) <= item_size) + if (!qs->attr.soc_id || qs->attr.revision) + return -ENOMEM; + + if (offsetof(struct socinfo, serial_num) <= item_size) { qs->attr.serial_number = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%u", le32_to_cpu(info->serial_num)); + if (!qs->attr.serial_number) + return -ENOMEM; + } qs->soc_dev = soc_device_register(&qs->attr); if (IS_ERR(qs->soc_dev)) -- 2.43.0