brcmf_chip_get_raminfo() reports "RAM size is incorrect" on a dead device but leaves the bogus value in ci->ramsize. A following brcmf_fw_crashed() then dumps that many bytes from the TCM mapping, which is only as large as BAR2, and faults in ioread32(): memdump 0x00200000+15728640 exceeds TCM window 0x800000 Remember the BAR2 size and refuse dumps that do not fit. Only builds with CONFIG_BRCMDBG create the memdump, so only they are affected. Found and written with the help of an AI coding assistant (Claude Opus 5.5); the cover letter describes how. Fixes: ff4445a8502c ("brcmfmac: expose device memory to devcoredump subsystem") Signed-off-by: Soeren Coremans --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c index 02c58de67b82..5abc85013110 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c @@ -343,6 +343,7 @@ struct brcmf_otp_params { struct brcmf_pciedev_info { enum brcmf_pcie_state state; + resource_size_t tcm_size; bool in_irq; struct pci_dev *pdev; char fw_name[BRCMF_FW_NAME_LEN]; @@ -1669,6 +1670,12 @@ static int brcmf_pcie_get_memdump(struct device *dev, void *data, size_t len) struct brcmf_pciedev_info *devinfo = buspub->devinfo; brcmf_dbg(PCIE, "dump at 0x%08X: len=%zu\n", devinfo->ci->rambase, len); + if (devinfo->ci->rambase > devinfo->tcm_size || + len > devinfo->tcm_size - devinfo->ci->rambase) { + brcmf_err(bus_if, "memdump 0x%08X+%zu exceeds TCM window %pa\n", + devinfo->ci->rambase, len, &devinfo->tcm_size); + return -EINVAL; + } brcmf_pcie_copy_dev_tomem(devinfo, devinfo->ci->rambase, data, len); return 0; } @@ -2145,6 +2152,7 @@ static int brcmf_pcie_get_resource(struct brcmf_pciedev_info *devinfo) devinfo->regs = ioremap(bar0_addr, BRCMF_PCIE_REG_MAP_SIZE); devinfo->tcm = ioremap(bar1_addr, bar1_size); + devinfo->tcm_size = bar1_size; if (!devinfo->regs || !devinfo->tcm) { brcmf_err(bus, "ioremap() failed (%p,%p)\n", devinfo->regs, -- 2.53.0