From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26ACFC43219 for ; Thu, 3 Feb 2022 20:37:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355238AbiBCUha (ORCPT ); Thu, 3 Feb 2022 15:37:30 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:37834 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354647AbiBCUf2 (ORCPT ); Thu, 3 Feb 2022 15:35:28 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 0B04EB835B1; Thu, 3 Feb 2022 20:35:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6A674C340E8; Thu, 3 Feb 2022 20:35:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643920524; bh=JJpFLpXzXPk/tob/exmxLZtN9BW2CT29sd98rwJznw8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VnSuKYfpmKNY6CiZSdeBljA5Li6CIr4o7ohKGchwZcgk8ETYL2QNN0Tdx0FjabnSW UBtlBTv6gH8BsLD33ZWyvyVCzpA/kmG7he6C6Vzzyt86rdzCbKtxZxnknxKvpj1WMF lSAjRyir9335THIZxXbmtQrzXBuU/IK1zkCj3kIpMIb1ZXanW9WjRYtrhHM9J+bSpK hO3RKgLbMN+wTPNyxCtGQbrgH2tMu/Xnfqq7XTh1nY6++fVfYXCmhsWd6mpOX3JAP8 FDu5GpUNEFpyevOlSjRPCe8PqPptUJRF2AkkNmlKc7Ys5HqsciwYwlxKYXGH0i1UN6 pz/WzN9OBpxuw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Xiaoke Wang , Bean Huo , "Martin K . Petersen" , Sasha Levin , jejb@linux.ibm.com, bvanassche@acm.org, srinivas.kandagatla@linaro.org, avri.altman@wdc.com, huyue2@yulong.com, s.shtylyov@omprussia.ru, linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 14/25] scsi: ufs: ufshcd-pltfrm: Check the return value of devm_kstrdup() Date: Thu, 3 Feb 2022 15:34:35 -0500 Message-Id: <20220203203447.3570-14-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220203203447.3570-1-sashal@kernel.org> References: <20220203203447.3570-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Xiaoke Wang [ Upstream commit a65b32748f4566f986ba2495a8236c141fa42a26 ] devm_kstrdup() returns pointer to allocated string on success, NULL on failure. So it is better to check the return value of it. Link: https://lore.kernel.org/r/tencent_4257E15D4A94FF9020DDCC4BB9B21C041408@qq.com Reviewed-by: Bean Huo Signed-off-by: Xiaoke Wang Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/ufs/ufshcd-pltfrm.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/scsi/ufs/ufshcd-pltfrm.c b/drivers/scsi/ufs/ufshcd-pltfrm.c index e49505534d498..0f2430fb398db 100644 --- a/drivers/scsi/ufs/ufshcd-pltfrm.c +++ b/drivers/scsi/ufs/ufshcd-pltfrm.c @@ -92,6 +92,11 @@ static int ufshcd_parse_clock_info(struct ufs_hba *hba) clki->min_freq = clkfreq[i]; clki->max_freq = clkfreq[i+1]; clki->name = devm_kstrdup(dev, name, GFP_KERNEL); + if (!clki->name) { + ret = -ENOMEM; + goto out; + } + if (!strcmp(name, "ref_clk")) clki->keep_link_active = true; dev_dbg(dev, "%s: min %u max %u name %s\n", "freq-table-hz", @@ -128,6 +133,8 @@ static int ufshcd_populate_vreg(struct device *dev, const char *name, return -ENOMEM; vreg->name = devm_kstrdup(dev, name, GFP_KERNEL); + if (!vreg->name) + return -ENOMEM; snprintf(prop_name, MAX_PROP_SIZE, "%s-max-microamp", name); if (of_property_read_u32(np, prop_name, &vreg->max_uA)) { -- 2.34.1