Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp7290003rwi; Mon, 24 Oct 2022 12:26:02 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6N7yLKgIfFjGPa86lvA0G6Nv/dqaRzcVwpaO6lVRLv2wHR4PMFXcJ+aYV0lz+/keB9gygX X-Received: by 2002:a05:6402:555:b0:461:a144:e949 with SMTP id i21-20020a056402055500b00461a144e949mr8883684edx.45.1666639562367; Mon, 24 Oct 2022 12:26:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666639562; cv=none; d=google.com; s=arc-20160816; b=L38pq59OF33RgDv48qmo0T3QbhBdELVLx3XNbUW4XA5T2H8oqpw6FE2fPIHUXcoguN W5cv8ddZY49jTvU7qbg6erOfJ8lY0PABfjFcX0UDEVfuSTKZ7mOloK2P329WvF6iyqsn 4yqS319oge7isbDYknEB5T/bK6P+PNc4NnrHI/xj3gG09QJv70g6NYj5SbRRWy7PKKdU eoyv/JRETPS2DkzRO2ghKf+Wz3Yx/iIHOgbR2Vp4ohkgbDssPfG588wh3ZrBD1xaj3fp 3khq+9Rj4scmZNPwBM7+VLfgpdVQj2BAJdcEKRNhOgAFpbwTzhtMMZEhPzhR8XCW4nWP 1stA== 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=zu1oeviqFyVLjNe3Q5zOpbvzyj3yjPX+r4jvcSkmVc0pXNH5E4RujOqXpsDVMUtJxf LRnDwaUGmlqAz0qIKzxz0BlYco6AGK3MQmY6rTqLPt8AgHYhx/suSQoQAkMFrRqiSyn9 PavWsK3Uvc5X6U8qG38gtTecfiiwXN2hfrjFJkWR868teFCAR80nfXDAk6q0a08cuTGB udaB244Obe7OTQJ3juGIRx59TBAahtQMxo0ITkXVf0Idci8Uk5nGP7h+W82eSF0mPPRB s4v53SDfyzLkP3XUcimY58SQk7Fmilfq0HdJDbNlXuJfZLYe89frG9jC89GeNNnFPY3D Ugaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=PI9CeQHP; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y6-20020a056402270600b004615c5728e8si675270edd.494.2022.10.24.12.25.36; Mon, 24 Oct 2022 12:26:02 -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=PI9CeQHP; 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 S231718AbiJXTW0 (ORCPT + 99 others); Mon, 24 Oct 2022 15:22:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231790AbiJXTVj (ORCPT ); Mon, 24 Oct 2022 15:21:39 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E03280BEF; Mon, 24 Oct 2022 10:57:05 -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 ams.source.kernel.org (Postfix) with ESMTPS id 99810B819FF; Mon, 24 Oct 2022 12:54:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C26EDC433C1; Mon, 24 Oct 2022 12:54:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666616070; bh=eYYfN7zhVXu7HoSsesfCM1CBNUKWw1PFo052PAgMnNo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PI9CeQHP5oOFyQPVf1yGG8XCpnQLoBEbbjL85vFYmZPMc5Bwu7Z/i4NVE6pJfoaIa Nc2L8zAbKFdTS+BQ2+q0A/utgEuowuInT6WFIQXgBEtSwrs4oaV7jCzeBoJlBO/NU+ /L0ZYqNEogX6aZI5PFefDg+mTDpdEYB6DCZ2//MI= 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.15 489/530] ata: libahci_platform: Sanity check the DT child nodes number Date: Mon, 24 Oct 2022 13:33:53 +0200 Message-Id: <20221024113107.180562670@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 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); -- 2.35.1