From: Serge Semin <Sergey.Semin@baikalelectronics.ru>
To: Damien Le Moal <damien.lemoal@opensource.wdc.com>,
Hans de Goede <hdegoede@redhat.com>, Jens Axboe <axboe@kernel.dk>
Cc: Serge Semin <Sergey.Semin@baikalelectronics.ru>,
Serge Semin <fancer.lancer@gmail.com>,
Alexey Malahov <Alexey.Malahov@baikalelectronics.ru>,
Pavel Parkhomenko <Pavel.Parkhomenko@baikalelectronics.ru>,
Rob Herring <robh+dt@kernel.org>, <linux-ide@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org>
Subject: [PATCH v2 09/23] ata: libahci_platform: Sanity check the DT child nodes number
Date: Tue, 3 May 2022 23:09:24 +0300 [thread overview]
Message-ID: <20220503200938.18027-10-Sergey.Semin@baikalelectronics.ru> (raw)
In-Reply-To: <20220503200938.18027-1-Sergey.Semin@baikalelectronics.ru>
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 4 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 <Sergey.Semin@baikalelectronics.ru>
---
Changelog v2:
- Drop the else word from the child_nodes value checking if-else-if
statement (@Damien) and convert the after-else part into the ternary
operator-based statement.
---
drivers/ata/libahci_platform.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/ata/libahci_platform.c b/drivers/ata/libahci_platform.c
index 7ff6626fd569..4e54e19f07b2 100644
--- a/drivers/ata/libahci_platform.c
+++ b/drivers/ata/libahci_platform.c
@@ -480,15 +480,22 @@ 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)
- hpriv->nports = 1;
+ hpriv->nports = child_nodes ?: 1;
hpriv->phys = devm_kcalloc(dev, hpriv->nports, sizeof(*hpriv->phys), GFP_KERNEL);
if (!hpriv->phys) {
--
2.35.1
next prev parent reply other threads:[~2022-05-03 20:10 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-03 20:09 [PATCH v2 00/23] ata: ahci: Add DWC/Baikal-T1 AHCI SATA support Serge Semin
2022-05-03 20:09 ` [PATCH v2 01/23] dt-bindings: ata: ahci-platform: Drop dma-coherent property declaration Serge Semin
2022-05-03 20:09 ` [PATCH v2 02/23] dt-bindings: ata: ahci-platform: Detach common AHCI bindings Serge Semin
2022-05-03 20:29 ` Damien Le Moal
2022-05-03 20:43 ` Serge Semin
2022-05-03 20:09 ` [PATCH v2 03/23] dt-bindings: ata: ahci-platform: Clarify common AHCI props constraints Serge Semin
2022-05-03 20:09 ` [PATCH v2 04/23] dt-bindings: ata: sata: Extend number of SATA ports Serge Semin
2022-05-03 20:09 ` [PATCH v2 05/23] ata: libahci_platform: Explicitly set rc on devres_alloc failure Serge Semin
2022-05-03 20:09 ` [PATCH v2 06/23] ata: libahci_platform: Convert to using platform devm-ioremap methods Serge Semin
2022-05-03 20:09 ` [PATCH v2 07/23] ata: libahci_platform: Convert to using devm bulk clocks API Serge Semin
2022-05-04 4:16 ` kernel test robot
2022-05-04 4:26 ` kernel test robot
2022-05-03 20:09 ` [PATCH v2 08/23] ata: libahci_platform: Add function returning a clock-handle by id Serge Semin
2022-05-03 20:09 ` Serge Semin [this message]
2022-05-03 20:09 ` [PATCH v2 10/23] ata: libahci_platform: Parse ports-implemented property in resources getter Serge Semin
2022-05-03 20:09 ` [PATCH v2 11/23] ata: libahci_platform: Introduce reset assertion/deassertion methods Serge Semin
2022-05-03 20:09 ` [PATCH v2 12/23] dt-bindings: ata: ahci: Add platform capability properties Serge Semin
2022-05-03 20:09 ` [PATCH v2 13/23] ata: libahci: Extend port-cmd flags set with port capabilities Serge Semin
2022-05-03 20:09 ` [PATCH v2 14/23] ata: libahci: Discard redundant force_port_map parameter Serge Semin
2022-05-03 20:09 ` [PATCH v2 15/23] ata: libahci: Don't read AHCI version twice in the save-config method Serge Semin
2022-05-03 20:09 ` [PATCH v2 16/23] ata: ahci: Convert __ahci_port_base to accepting hpriv as arguments Serge Semin
2022-05-03 20:09 ` [PATCH v2 17/23] ata: ahci: Introduce firmware-specific caps initialization Serge Semin
2022-05-03 20:09 ` [PATCH v2 18/23] dt-bindings: ata: ahci: Add DWC AHCI SATA controller DT schema Serge Semin
2022-05-03 20:09 ` [PATCH v2 19/23] ata: ahci: Add DWC AHCI SATA controller support Serge Semin
2022-05-03 20:09 ` [PATCH v2 20/23] dt-bindings: ata: ahci: Add Baikal-T1 AHCI SATA controller DT schema Serge Semin
2022-05-03 20:09 ` [PATCH v2 21/23] ata: ahci-dwc: Add platform-specific quirks support Serge Semin
2022-05-03 20:09 ` [PATCH v2 22/23] ata: ahci-dwc: Add Baikal-T1 AHCI SATA interface support Serge Semin
2022-05-03 20:09 ` [PATCH v2 23/23] MAINTAINERS: Add maintainers for DWC AHCI SATA driver Serge Semin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220503200938.18027-10-Sergey.Semin@baikalelectronics.ru \
--to=sergey.semin@baikalelectronics.ru \
--cc=Alexey.Malahov@baikalelectronics.ru \
--cc=Pavel.Parkhomenko@baikalelectronics.ru \
--cc=axboe@kernel.dk \
--cc=damien.lemoal@opensource.wdc.com \
--cc=devicetree@vger.kernel.org \
--cc=fancer.lancer@gmail.com \
--cc=hdegoede@redhat.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®