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 EDE0D46BBD; Mon, 8 Jan 2024 12:29:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="guyrjgYG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 85D56C433CA; Mon, 8 Jan 2024 12:29:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1704716971; bh=G4ip5jfl9JfDX8Jhcz/cU2wljO5aEdScGmo3SrX3ccQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=guyrjgYGE8rjLZhvuLeap0fv+07f2ZBY6FxzVKqNdgHzIanaOkofvtj0QhUEN+3mk hfDBNgfSGF9YhyagrDvpc036tGcI900uaXEeKXUMijwYi6/zc7oMV747McemfDGwR8 hKU2ZnyHIEX77sfOTWv5BNfL1DnVkkF8PPSLr2tqyL6ECwYoTmYhcD56WAuyzSUP6/ A+AkxFh88V37s1DCIi8FmigDOo1LtCsL71iZ24aGSDvddRW3TtsNA7lvaauesYHWXT ZV9caguX8z5ErOv+BVu17RqqgcHvzyorT5YPvBwkVvg2AMMWOJ9LOxE7QYmLVJ0emS Qko8yU7BHXZGw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Stefan Wahren , Nick Desaulniers , Chen-Yu Tsai , Arnd Bergmann , Sasha Levin , linux@armlinux.org.uk, jernej.skrabec@gmail.com, samuel@sholland.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev Subject: [PATCH AUTOSEL 4.19 2/2] ARM: sun9i: smp: fix return code check of of_property_match_string Date: Mon, 8 Jan 2024 07:29:24 -0500 Message-ID: <20240108122926.2090989-2-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240108122926.2090989-1-sashal@kernel.org> References: <20240108122926.2090989-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 4.19.303 Content-Transfer-Encoding: 8bit From: Stefan Wahren [ Upstream commit 643fe70e7bcdcc9e2d96952f7fc2bab56385cce5 ] of_property_match_string returns an int; either an index from 0 or greater if successful or negative on failure. Even it's very unlikely that the DT CPU node contains multiple enable-methods these checks should be fixed. This patch was inspired by the work of Nick Desaulniers. Link: https://lore.kernel.org/lkml/20230516-sunxi-v1-1-ac4b9651a8c1@google.com/T/ Cc: Nick Desaulniers Signed-off-by: Stefan Wahren Link: https://lore.kernel.org/r/20231228193903.9078-2-wahrenst@gmx.net Reviewed-by: Chen-Yu Tsai Signed-off-by: Arnd Bergmann Signed-off-by: Sasha Levin --- arch/arm/mach-sunxi/mc_smp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-sunxi/mc_smp.c b/arch/arm/mach-sunxi/mc_smp.c index ff173e67eed21..1fbc5b5a3cfe8 100644 --- a/arch/arm/mach-sunxi/mc_smp.c +++ b/arch/arm/mach-sunxi/mc_smp.c @@ -801,14 +801,14 @@ static int __init sunxi_mc_smp_init(void) for (i = 0; i < ARRAY_SIZE(sunxi_mc_smp_data); i++) { ret = of_property_match_string(node, "enable-method", sunxi_mc_smp_data[i].enable_method); - if (!ret) + if (ret >= 0) break; } is_a83t = sunxi_mc_smp_data[i].is_a83t; of_node_put(node); - if (ret) + if (ret < 0) return -ENODEV; if (!sunxi_mc_smp_cpu_table_init()) -- 2.43.0