From patchwork Tue May 16 16:35:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 13243415 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 F3ED8C77B7F for ; Tue, 16 May 2023 16:35:58 +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:Cc:To:From:Subject:Message-ID: Mime-Version:Date: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=kbTj3oEMrWWAM9TCAQx8N0ujCgnqoDbUX7XfH/uU1v0=; b=Lyq 0Vzhakr1riGqLPjq8JKi7r5WHolfG/9YT84N4pxq7ciim2/r6QUcDai/bLx4OPNWJZjw1Gba39chx 58/FCcvqMgIODM20r9ldvcn+V5ebs/+2ed8CJ0HaMFcLnYI9zjoX3hNpuDzm/gUgBUm88TAmflaVE +rODCTUrXS41Nh9ETpbHqR9kZpMlQOE9WoNHa3RcdP9N9yCNcoNP1Dy2O/ypVbTUmpg6eyr2THF7h mvIe6phZZXeQ9qWl7MDKDpyhiJWnN5VLmxegfzb7LulnAtG2KRrTTaLXre1OQaupCqMjNKQ/+nA78 nx2e0qplcTIIVY4VtnHpnVxd/umO90w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pyxeF-006UK0-08; Tue, 16 May 2023 16:35:39 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pyxeC-006UHC-0H for linux-arm-kernel@lists.infradead.org; Tue, 16 May 2023 16:35:37 +0000 Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-ba718f5cd50so9163548276.0 for ; Tue, 16 May 2023 09:35:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1684254926; x=1686846926; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=gUa88uA2hYweTlW6jtqdlmsRUFKb/Wg9un/qBrBPn3s=; b=NXO92GvoVezp5vtSlpbo3cxcYFK9xb9EKBtf5Y0Xdx036oq9OVoj4C4mchO9a4549/ dfh96bKSsCuFkVrkoHTxWoPz/6ncy/7qy3qbthH/+SE08AntvNH4DemfIX5qgEPbQTaQ wXjmyMKZWIAOSX8NPN3wKJapyYs82k3ZrgHqeo5fVkmGlIXAc3mjA6QPj1Ej5mgCdaIC KO5Ubiojt0f371JV9nHDNoz6YXlxe4NCD333KTNkZ+6uK8iTtwvbBls38uR2YgPxV1gD YRbC5XvpSn1P3u4GAbE1HYBtfftsfVgDoTdtjhmTgBy0boXZEFV9yK5az9LFAz/IkgnR SNVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684254926; x=1686846926; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=gUa88uA2hYweTlW6jtqdlmsRUFKb/Wg9un/qBrBPn3s=; b=SakOnwjyDhSMLQHpMPnU9Jr8bB8SiGJU2wKAnI7tlzIA0KctJx5/A4hXexwJ4YzHy8 HiVqekoD+ELIOGTHRrueUHy/svulJ3/H9QUr/XXPMs3jONgCgDr4MiESZFHB5Z0GHCNC v3kkd6riN5jC/6xxBxm5+KCRPhZz2KckfqpG8WzEEw02kiIfMdgK3oUi7v9AaxGRlaCY KobnXvd30UMPkGXHD98kKZiA38bYORvvXHeFajTPMHuVHiRfN6cjlBu4jUYzZoMBgx8/ SBuUWu3PALEgC2w1OV4/zxZUcutUlkbQ1aera5HFzmA9ceuzO30fEIsff22XAiI9Aglj UcPw== X-Gm-Message-State: AC+VfDwu5ejrL4Mzvbi7VLWwwWr5B+XdLUEWD1JR0/YQjPmkpUAoaQa1 M2PNc09BNBowhWv5HEr7Ubys4TwDgC3u4BICqzg= X-Google-Smtp-Source: ACHHUZ4CU7PQkUwbdsSPEM4ZOjm46cfnUm9Z8my3bsmEl3HnEwbIYc7Zk2G2KuokdSSKVRDbLacBJeuPuXPl7+4/UuA= X-Received: from ndesaulniers-desktop.svl.corp.google.com ([2620:15c:2d1:203:565c:9ff:179b:e041]) (user=ndesaulniers job=sendgmr) by 2002:a05:6902:12cd:b0:ba7:8099:c5f2 with SMTP id j13-20020a05690212cd00b00ba78099c5f2mr4644791ybu.8.1684254926394; Tue, 16 May 2023 09:35:26 -0700 (PDT) Date: Tue, 16 May 2023 09:35:24 -0700 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAMuwY2QC/x2NQQqEMAwAvyI5W9DIiutXxEPaZjUHu5KoCOLft +5xmIG5wFiFDfriAuVDTL4pQ10WEGZKEzuJmQErbKpX3Trb0ynOh3eMhBGxY8itJ2PnlVKYn3o h21gfsSp/5PwPhvG+f2QFVVJwAAAA X-Developer-Key: i=ndesaulniers@google.com; a=ed25519; pk=UIrHvErwpgNbhCkRZAYSX0CFd/XFEwqX3D0xqtqjNug= X-Developer-Signature: v=1; a=ed25519-sha256; t=1684254924; l=2325; i=ndesaulniers@google.com; s=20220923; h=from:subject:message-id; bh=HeYXtdc42ggv/HgpsdPBYElqbpwOzwZ45ptetH+ABw0=; b=dEE8zaTLMnBBX42jOmlfnND2ZU1AR4CCqhuNxz2ufaig7+XrDtdNK0l17FQtfw9u6G4m1VSxgPrA D9l8d6VZBlnJ7f3LH9JoW0nBMghvvH+dc8FA6D3nXOg4RY1GUV3Y X-Mailer: b4 0.12.2 Message-ID: <20230516-sunxi-v1-1-ac4b9651a8c1@google.com> Subject: [PATCH] ARM: sunxi: fix return code check of of_property_match_string From: ndesaulniers@google.com To: Chen-Yu Tsai , Jernej Skrabec , Samuel Holland Cc: Russell King , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Nick Desaulniers X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230516_093536_127681_D21B18CC X-CRM114-Status: GOOD ( 15.45 ) 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 of_property_match_string returns an int; either an index from 0 or greater if successful or negative on failure. Fixes the following splat observed with UBSAN: [ 0.166489][ T1] UBSAN: array-index-out-of-bounds in arch/arm/mach-sunxi/mc_smp.c:810:29 [ 0.166934][ T1] index 2 is out of range for type 'sunxi_mc_smp_data [2]' [ 0.167206][ T1] CPU: 0 PID: 1 Comm: swapper/0 Tainted: G W 6.4.0-rc2 #1 [ 0.167515][ T1] Hardware name: Generic DT based system [ 0.167727][ T1] unwind_backtrace from show_stack+0x18/0x1c [ 0.167979][ T1] show_stack from dump_stack_lvl+0x68/0x90 [ 0.168226][ T1] dump_stack_lvl from ubsan_epilogue+0x8/0x34 [ 0.168474][ T1] ubsan_epilogue from __ubsan_handle_out_of_bounds+0x78/0x80 [ 0.168760][ T1] __ubsan_handle_out_of_bounds from sunxi_mc_smp_init+0xe8/0x574 [ 0.169100][ T1] sunxi_mc_smp_init from do_one_initcall+0x178/0x9c8 [ 0.169364][ T1] do_one_initcall from kernel_init_freeable+0x1dc/0x28c [ 0.169661][ T1] kernel_init_freeable from kernel_init+0x20/0x164 [ 0.169912][ T1] kernel_init from ret_from_fork+0x14/0x2c Signed-off-by: Nick Desaulniers --- arch/arm/mach-sunxi/mc_smp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- base-commit: f1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6 change-id: 20230516-sunxi-bc9dda2d228e Best regards, diff --git a/arch/arm/mach-sunxi/mc_smp.c b/arch/arm/mach-sunxi/mc_smp.c index cb63921232a6..c7635e9e36ef 100644 --- a/arch/arm/mach-sunxi/mc_smp.c +++ b/arch/arm/mach-sunxi/mc_smp.c @@ -782,7 +782,7 @@ static int __init sunxi_mc_smp_init(void) struct device_node *node; struct resource res; void __iomem *addr; - int i, ret; + int i, ret = -1; /* * Don't bother checking the "cpus" node, as an enable-method @@ -803,10 +803,13 @@ 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; } + if (ret < 0) + return -ENODEV; + is_a83t = sunxi_mc_smp_data[i].is_a83t; of_node_put(node);