From patchwork Mon Oct 24 11:32:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9360 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp476237wru; Mon, 24 Oct 2022 07:13:32 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7Oiq1pCa3FRAEherkhML4OiHkrY0TRoFQk3/yTFo2mGT7BZjMGly64MCd2XxSSsMDSDHOw X-Received: by 2002:a17:907:2d89:b0:78d:9c30:452b with SMTP id gt9-20020a1709072d8900b0078d9c30452bmr26336259ejc.533.1666620812028; Mon, 24 Oct 2022 07:13:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666620812; cv=none; d=google.com; s=arc-20160816; b=INGOCsXf628nJZZ1UC4Wdf3MpZFNSepu8i1T1bbxnqIZImR6h9tfBZBtthPcavZ+nr wntGIs6CKKTxAyuq3n5pLu6GRt8EVXCyBfgf8aaZpVDwXZ6r3M3/3E8EgKU5jCaqYupj al3X2tp6s1D5jqngK94o+nt3F0alDRKMSakjQWtA0aSDEkGz6fsteq7OElxu62CNz5BG Tvnl98foSCzuNGY/MEsniVhVymlJkcz2bupwaUVClP/7nBPegUaVKAmKkPhCQtKAgLQc YvHwbSkamB6VsaKJldjbtE4K/+pSUyv7fyyYMGsHJoZo+GX5CPeOI/eweTnLAwsE9BIL O35A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=AaUhWEz2XIGNtScn4QMC+WmDjQ+8BXUOG+rblKALsP4=; b=CcGmdmlCPoMOtgxwrO8FPDs7HNQTrbQLcQnCrDl/FaoF7mT8mENFy7jybTnaV34lkJ ZqT+hn8MIa4stRjOihLXjMtv+IElAmK2an1vJuuv4n7cwaW7PCfCuKR+PoqTj036A92M TgMPoNdbiLlCQTWLPgpJC/jOT2P5ejwO9IS812pbaCPSQIkwR7f9yqhmWy6S53f9QQrD SXBnbYF5J1J3y6EwAZ9KtUMl0svE59auNqtYMjzz5Y2RzC+asPXcIWFhLMHACCwfz7MW +Kk0ZvWctvH5cqdf/fRQSAtO+G37AKn0rKaq/OH1Qe2HgFskMjCegox/OGq7S601dcWJ wMBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZnmZKdqy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n15-20020aa7d04f000000b0046109fd5943si6242499edo.544.2022.10.24.07.13.07; Mon, 24 Oct 2022 07:13:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZnmZKdqy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236717AbiJXN55 (ORCPT + 99 others); Mon, 24 Oct 2022 09:57:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236772AbiJXN5e (ORCPT ); Mon, 24 Oct 2022 09:57:34 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A5FA61128; Mon, 24 Oct 2022 05:45:15 -0700 (PDT) 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 dfw.source.kernel.org (Postfix) with ESMTPS id 6D1F8612DD; Mon, 24 Oct 2022 12:31:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DFA5C433D6; Mon, 24 Oct 2022 12:31:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614701; bh=eYYfN7zhVXu7HoSsesfCM1CBNUKWw1PFo052PAgMnNo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZnmZKdqyKAGS+sa3hf/Wi18sOMGCNc1rcikJzHkELZMgGL3DTwRO6HiKDKl9/YbSB sgHPPEWQLokdK+sLrKgZ/TUoGvzgMituPzLthtwf5vdKCUBZAEfWq6gkNvt4W9mdLj WqUSE0amRS1lx3CqgnqhxgR9mZR27Bzi/bKGisDo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Serge Semin , Hannes Reinecke , Damien Le Moal , Sasha Levin Subject: [PATCH 5.10 362/390] ata: libahci_platform: Sanity check the DT child nodes number Date: Mon, 24 Oct 2022 13:32:39 +0200 Message-Id: <20221024113038.411997440@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747578584854744371?= X-GMAIL-MSGID: =?utf-8?q?1747578584854744371?= From: Serge Semin [ Upstream commit 3c132ea6508b34956e5ed88d04936983ec230601 ] Having greater than AHCI_MAX_PORTS (32) ports detected isn't that critical from the further AHCI-platform initialization point of view since exceeding the ports upper limit will cause allocating more resources than will be used afterwards. But detecting too many child DT-nodes doesn't seem right since it's very unlikely to have it on an ordinary platform. In accordance with the AHCI specification there can't be more than 32 ports implemented at least due to having the CAP.NP field of 5 bits wide and the PI register of dword size. Thus if such situation is found the DTB must have been corrupted and the data read from it shouldn't be reliable. Let's consider that as an erroneous situation and halt further resources allocation. Note it's logically more correct to have the nports set only after the initialization value is checked for being sane. So while at it let's make sure nports is assigned with a correct value. Signed-off-by: Serge Semin Reviewed-by: Hannes Reinecke Signed-off-by: Damien Le Moal Signed-off-by: Sasha Levin --- drivers/ata/libahci_platform.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/ata/libahci_platform.c b/drivers/ata/libahci_platform.c index 0910441321f7..64d6da0a5303 100644 --- a/drivers/ata/libahci_platform.c +++ b/drivers/ata/libahci_platform.c @@ -451,14 +451,24 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev, } } - hpriv->nports = child_nodes = of_get_child_count(dev->of_node); + /* + * Too many sub-nodes most likely means having something wrong with + * the firmware. + */ + child_nodes = of_get_child_count(dev->of_node); + if (child_nodes > AHCI_MAX_PORTS) { + rc = -EINVAL; + goto err_out; + } /* * If no sub-node was found, we still need to set nports to * one in order to be able to use the * ahci_platform_[en|dis]able_[phys|regulators] functions. */ - if (!child_nodes) + if (child_nodes) + hpriv->nports = child_nodes; + else hpriv->nports = 1; hpriv->phys = devm_kcalloc(dev, hpriv->nports, sizeof(*hpriv->phys), GFP_KERNEL);