From nobody Mon Dec 1 22:37:31 2025 Received: from out30-112.freemail.mail.aliyun.com (out30-112.freemail.mail.aliyun.com [115.124.30.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AFC7E2E2DD2 for ; Wed, 26 Nov 2025 12:57:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.112 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764161864; cv=none; b=k0d1aa4zusYgakTVTc5ZtqWdsXwLhkvFJRvn8Xs3ziOirv/wzZ5+ySjplqwyVz2j4ZewIJxoMAznbi3PnF26OahgHWboTCbWxwxGq31O5kQrygublbEnjhS99QVdYUTfWUy/o9TtYFBINkA+6uZ0cW9lXI0OjWDCSTY7ykIYW0E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764161864; c=relaxed/simple; bh=aqvFk+ALKls8g5Sze0Abn/zVou2UpEi59CYpNm/zEC0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=QqcfJ3s2UrCH0yTvwRl2xg1DgGV8rP3q2lWyILf175Wh05MeoPZnz5S9+WQ+3n4DjfeIuYHZCntmai7jzfu2XAS9OBk88Odk4v4kPpbmEeVhIjEno8+ReNNLmQj8CTxRxcMFET8oaHoIGre9nTcIqDD+ivAN2rB3AGylfJ5nEJg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com; spf=pass smtp.mailfrom=linux.alibaba.com; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b=fH5f64TN; arc=none smtp.client-ip=115.124.30.112 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b="fH5f64TN" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1764161851; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=SgXKwUhhTeKHYzo/xGlIpfJoc6LiwA1BLpHr2iNsom4=; b=fH5f64TNcOYSgzYYG5pITbkA4V6qnl+seDmmJBFKmpf+YAYeMd17TMR5ROxwvbN1C7iETX51rSIafldRcba0cSpjpUPDNh6WfbRCKmUvn0Xl6pfQP4unEii3L8ZfEChijAFHK2R9DioSnccWDmFhwUovbA8kLGfcf2Mjgaw3Gos= Received: from localhost(mailfrom:kanie@linux.alibaba.com fp:SMTPD_---0WtSjrQE_1764161847 cluster:ay36) by smtp.aliyun-inc.com; Wed, 26 Nov 2025 20:57:31 +0800 From: Guixin Liu To: Bjorn Helgaas , Andy Shevchenko Cc: linux-kernel@vger.kernel.org Subject: [PATCH v4] PCI: Check rom header and data structure addr before accessing Date: Wed, 26 Nov 2025 20:57:27 +0800 Message-ID: <20251126125727.57620-1-kanie@linux.alibaba.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We meet a crash when running stress-ng on x86_64 machine: BUG: unable to handle page fault for address: ffa0000007f40000 RIP: 0010:pci_get_rom_size+0x52/0x220 Call Trace: pci_map_rom+0x80/0x130 pci_read_rom+0x4b/0xe0 kernfs_file_read_iter+0x96/0x180 vfs_read+0x1b1/0x300 Our analysis reveals that the rom space's start address is 0xffa0000007f30000, and size is 0x10000. Because of broken rom space, before calling readl(pds), the pds's value is 0xffa0000007f3ffff, which is already pointed to the rom space end, invoking readl() would read 4 bytes therefore cause an out-of-bounds access and trigger a crash. Fix this by adding image header and data structure checking. We also found another crash on arm64 machine: Unable to handle kernel paging request at virtual address ffff8000dd1393ff Mem abort info: ESR =3D 0x0000000096000021 EC =3D 0x25: DABT (current EL), IL =3D 32 bits SET =3D 0, FnV =3D 0 EA =3D 0, S1PTW =3D 0 FSC =3D 0x21: alignment fault The call trace is the same with x86_64, but the crash reason is that the data structure addr is not aligned with 4, and arm64 machine report "alignment fault". Fix this by adding alignment checking. Fixes: 47b975d234ea ("PCI: Avoid iterating through memory outside the resou= rce window") Suggested-by: Guanghui Feng Signed-off-by: Guixin Liu Reviewed-by: Andy Shevchenko --- v3 -> v4: - Use "u64" instead of "uintptr_t". - Invert the if statement to avoid excessive indentation. - Add comment for alignment checking. - Change last_image's type from int to bool. v2 -> v3: - Add pci_rom_header_valid() helper for checking image addr and signature. - Add pci_rom_data_struct_valid() helper for checking data struct add and signature. - Handle overflow issue when adding addr with size. - Handle alignment fault when running on arm64. v1 -> v2: - Fix commit body problems, such as blank line in "Call Trace" both sides, thanks, (Andy Shevchenko). - Remove every step checking, just check the addr is in header or data stru= ct. - Add Suggested-by: Guanghui Feng tag. drivers/pci/rom.c | 105 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 86 insertions(+), 19 deletions(-) diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c index e18d3a4383ba..e3d6aeedb602 100644 --- a/drivers/pci/rom.c +++ b/drivers/pci/rom.c @@ -69,6 +69,83 @@ void pci_disable_rom(struct pci_dev *pdev) } EXPORT_SYMBOL_GPL(pci_disable_rom); =20 +#define PCI_ROM_HEADER_SIZE 0x1A + +static inline bool pci_rom_header_valid(struct pci_dev *pdev, + void __iomem *image, + void __iomem *rom, + size_t size, + bool last_image) +{ + u64 rom_end =3D (u64)rom + size; + u64 header_end; + + /* + * Some CPU architectures require IOMEM access addresses to + * be aligned, for example arm64, so since we're about to + * call readw(), we check here for 2-byte alignment. + */ + if (!IS_ALIGNED((u64)image, 2)) + return false; + + if (check_add_overflow((u64)image, PCI_ROM_HEADER_SIZE, &header_end)) + return false; + + if (image < rom || header_end >=3D rom_end) + return false; + + /* Standard PCI ROMs start out with these bytes 55 AA */ + if (readw(image) =3D=3D 0xAA55) + return true; + + if (!last_image) + pci_info(pdev, "No more image in the PCI ROM\n"); + else + pci_info(pdev, "Invalid PCI ROM header signature: expecting 0xaa55, got = %#06x\n", + readw(image)); + return false; +} + +static inline bool pci_rom_data_struct_valid(struct pci_dev *pdev, + void __iomem *pds, + void __iomem *rom, + size_t size) +{ + u64 rom_end =3D (u64)rom + size; + u64 end; + u16 data_len; + + /* + * Some CPU architectures require IOMEM access addresses to + * be aligned, for example arm64, so since we're about to + * call readl(), we check here for 4-byte alignment. + */ + if (!IS_ALIGNED((u64)pds, 4)) + return false; + + /* Before reading length, check range. */ + if (check_add_overflow((u64)pds, 0x0B, &end)) + return false; + + if (pds < rom || end >=3D rom_end) + return false; + + data_len =3D readw(pds + 0x0A); + if (!data_len || data_len =3D=3D 0xFFFF || + check_add_overflow((u64)pds, data_len, &end)) + return false; + + if (end >=3D rom_end) + return false; + + if (readl(pds) =3D=3D 0x52494350) + return true; + + pci_info(pdev, "Invalid PCI ROM data signature: expecting 0x52494350, got= %#010x\n", + readl(pds)); + return false; +} + /** * pci_get_rom_size - obtain the actual size of the ROM image * @pdev: target PCI device @@ -84,37 +161,27 @@ static size_t pci_get_rom_size(struct pci_dev *pdev, v= oid __iomem *rom, size_t size) { void __iomem *image; - int last_image; + bool last_image; unsigned int length; =20 image =3D rom; do { void __iomem *pds; - /* Standard PCI ROMs start out with these bytes 55 AA */ - if (readw(image) !=3D 0xAA55) { - pci_info(pdev, "Invalid PCI ROM header signature: expecting 0xaa55, got= %#06x\n", - readw(image)); + + if (!pci_rom_header_valid(pdev, image, rom, size, true)) break; - } + /* get the PCI data structure and check its "PCIR" signature */ pds =3D image + readw(image + 24); - if (readl(pds) !=3D 0x52494350) { - pci_info(pdev, "Invalid PCI ROM data signature: expecting 0x52494350, g= ot %#010x\n", - readl(pds)); + if (!pci_rom_data_struct_valid(pdev, pds, rom, size)) break; - } - last_image =3D readb(pds + 21) & 0x80; + + last_image =3D !!(readb(pds + 21) & 0x80); length =3D readw(pds + 16); image +=3D length * 512; - /* Avoid iterating through memory outside the resource window */ - if (image >=3D rom + size) + + if (!pci_rom_header_valid(pdev, image, rom, size, last_image)) break; - if (!last_image) { - if (readw(image) !=3D 0xAA55) { - pci_info(pdev, "No more image in the PCI ROM\n"); - break; - } - } } while (length && !last_image); =20 /* never return a size larger than the PCI resource window */ --=20 2.43.0