From: Sreeraj S Kurup <sreekuttan2156239@gmail.com>
To: mani@kernel.org
Cc: angelogioacchino.delregno@collabora.com, bhelgaas@google.com,
kwilczynski@kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org,
linux-pci@vger.kernel.org, lpieralisi@kernel.org,
matthias.bgg@gmail.com, robh@kernel.org, ryder.lee@mediatek.com,
sreekuttan2156239@gmail.com
Subject: [PATCH v6] PCI: mediatek: Fix integer truncation and handle oversized resources
Date: Wed, 28 Oct 2026 11:34:53 +0000 [thread overview]
Message-ID: <20261028113453.2599-1-sreekuttan2156239@gmail.com> (raw)
In-Reply-To: <kfnxuro5xf4mhokabg773zcyp7otcjxwpzcn3dlo6y3kpv4uv4@bne4qf3vcif5>
resource_size() returns a resource_size_t, which can be 64-bit on
64-bit architectures or 32-bit systems with LPAE/PAE enabled.
Passing this directly to fls(), which accepts an unsigned int,
implicitly truncates the upper bits.
Furthermore, AHB2PCIE_SIZE() uses a 5-bit mask GENMASK(4, 0). If
the size order exceeds the range representable by this field,
higher bits are discarded by the mask. This can leave the hardware
translation window smaller than the OS resource, causing bus
errors when accessing BARs in the unmapped upper region.
Fix this by using fls64(size) to calculate the size order without
truncating the resource size, and return -EINVAL if the size order
exceeds the supported range.
Changelog:
- v6: Move oversized resource validation before hardware
initialization to avoid leaving interrupts unmasked on
the error path.
- v5: Use fls64(size) instead of fls64(size - 1) and remove the
redundant zero-size check.
- v4: Fix struct device pointer access (pcie->dev) for dev_err().
Verified build and passed Sashiko review checks.
[Subject: PCI: mediatek: Fix integer truncation and handle
oversized resources]
- v3: Replace clamping logic with strict size validation
(size_order > 31 returns -EINVAL), add a zero-size check,
and update size calculation to fls64(size - 1).
[Subject: PCI: mediatek: Fix integer truncation and handle
oversized resources]
- v2: Add size clamping for size_order > 31 to prevent overflowing
the 5-bit AHB2PCIE_SIZE() macro mask.
[Subject: PCI: mediatek: Fix integer truncation in fls()
and clamp size]
- v1: Initial submission using fls64() to handle 64-bit resource
sizes and prevent integer truncation.
[Subject: PCI: mediatek: Fix integer truncation in fls()
for resource size]
Signed-off-by: Sreeraj S Kurup <sreekuttan2156239@gmail.com>
---
drivers/pci/controller/pcie-mediatek.c | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c
index 3a3e91cd0c21..cc04a7b862f0 100644
--- a/drivers/pci/controller/pcie-mediatek.c
+++ b/drivers/pci/controller/pcie-mediatek.c
@@ -8,6 +8,7 @@
*/
#include <linux/bitfield.h>
+#include <linux/bitops.h>
#include <linux/clk.h>
#include <linux/delay.h>
#include <linux/errno.h>
@@ -686,6 +687,8 @@ static int mtk_pcie_startup_port_v2(struct mtk_pcie_port *port)
const struct mtk_pcie_soc *soc = port->pcie->soc;
u32 val;
int err;
+ resource_size_t size;
+ int size_order;
entry = resource_list_first_type(&host->windows, IORESOURCE_MEM);
if (entry)
@@ -693,6 +696,13 @@ static int mtk_pcie_startup_port_v2(struct mtk_pcie_port *port)
if (!mem)
return -EINVAL;
+ size = resource_size(mem);
+ size_order = fls64(size);
+ if (size_order > 31) {
+ dev_err(pcie->dev, "Memory resource size too large: %pa\n", &size);
+ return -EINVAL;
+ }
+
/* MT7622 platforms need to enable LTSSM and ASPM from PCIe subsys */
if (pcie->base) {
val = readl(pcie->base + PCIE_SYS_CFG_V2);
@@ -754,7 +764,7 @@ static int mtk_pcie_startup_port_v2(struct mtk_pcie_port *port)
/* Set AHB to PCIe translation windows */
val = lower_32_bits(mem->start) |
- AHB2PCIE_SIZE(fls(resource_size(mem)));
+ AHB2PCIE_SIZE(size_order);
writel(val, port->base + PCIE_AHB_TRANS_BASE0_L);
val = upper_32_bits(mem->start);
@@ -775,6 +785,8 @@ static int mtk_pcie_startup_port_en7528(struct mtk_pcie_port *port)
struct resource_entry *entry;
u32 val, link_mask;
int err;
+ resource_size_t size;
+ int size_order;
entry = resource_list_first_type(&host->windows, IORESOURCE_MEM);
if (entry)
@@ -782,6 +794,13 @@ static int mtk_pcie_startup_port_en7528(struct mtk_pcie_port *port)
if (!mem)
return -EINVAL;
+ size = resource_size(mem);
+ size_order = fls64(size);
+ if (size_order > 31) {
+ dev_err(pcie->dev, "Memory resource size too large: %pa\n", &size);
+ return -EINVAL;
+ }
+
if (!pcie->cfg) {
dev_err(pcie->dev, "EN7528: pciecfg syscon not available\n");
return -EINVAL;
@@ -830,7 +849,7 @@ static int mtk_pcie_startup_port_en7528(struct mtk_pcie_port *port)
/* Set AHB to PCIe translation windows */
val = lower_32_bits(mem->start) |
- AHB2PCIE_SIZE(fls(resource_size(mem)));
+ AHB2PCIE_SIZE(size_order);
writel(val, port->base + PCIE_AHB_TRANS_BASE0_L);
val = upper_32_bits(mem->start);
--
2.55.0
prev parent reply other threads:[~2026-10-28 11:36 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-30 12:05 [PATCH v4] " Sreeraj S Kurup
2026-09-30 15:07 ` Sreeraj S Kurup
2026-10-27 13:11 ` Manivannan Sadhasivam
2026-10-28 10:34 ` Sreeraj S Kurup
2026-10-28 10:52 ` [PATCH v5] " Sreeraj S Kurup
2026-10-28 11:34 ` Sreeraj S Kurup [this message]
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=20261028113453.2599-1-sreekuttan2156239@gmail.com \
--to=sreekuttan2156239@gmail.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=bhelgaas@google.com \
--cc=kwilczynski@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-pci@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=mani@kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=robh@kernel.org \
--cc=ryder.lee@mediatek.com \
/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®