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 1D23CEEBB for ; Thu, 11 Dec 2025 12:45:44 +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=1765457148; cv=none; b=nqQiWlh/7WV6CHrwLzN134M6GM5GK+o0P/jjNJ9i8BMABMwMv38WYLfXV67Z3jgHW0V+9l/zhROec8B7BpzffpHEQbwKXU6zDdOZZjGrdR/3BFtpXfV294HmEtaeLNrsI9VayufvcvweiOhnUyeoRieWlNLI4oIOPcIKLYi1gSU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765457148; c=relaxed/simple; bh=voj1JA/fHz6HAC/eNpJzOuvsr0dpdAYwihIOSOt/Pdc=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=GNNDNavmOilGs7r1e9ulM8/qBUIrOCr2gWQxf5MgeL0WTS+iIJIZAuoD/p7f5bLIYU1828pgqU2C4rvubyffORdst4dBR31Wgf9hcHW9rQmg3zqsM5dnKlbqRb5ydLV2kIG6DSGi2FT310Z4xqG+TDrc41FYzmQXmLA3avN/S88= 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=wtyqFEBo; 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="wtyqFEBo" DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1765457141; h=Message-ID:Date:MIME-Version:Subject:To:From:Content-Type; bh=ykrYmrVTqc9HsGf3P5IdQk0RYg4eKi97iulX9LXTWmI=; b=wtyqFEBoLPnU53RHY+NVksq76VYH9BsP85eDipVVM1gMM/VuMhvcjeP3E8Zx9L30uVxpeu2JueX/OXm77T3UtLMmIToMbfe4ONbmIXyyl5c+otc7l29ObZzBkJ5dQv1/7REhrgF7sSDXJ2CUDvLOQ5FgpMsDfo6M3Gg8m2VWvyU= Received: from 30.178.203.102(mailfrom:kanie@linux.alibaba.com fp:SMTPD_---0WuaVx4-_1765457140 cluster:ay36) by smtp.aliyun-inc.com; Thu, 11 Dec 2025 20:45:41 +0800 Message-ID: <8d67712d-2fe5-4860-a38d-6f227b65d073@linux.alibaba.com> Date: Thu, 11 Dec 2025 20:45:39 +0800 Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: =?UTF-8?B?TW96aWxsYSBUaHVuZGVyYmlyZCDmtYvor5XniYg=?= Subject: Re: [PATCH v8 2/2] PCI: Check rom header and data structure addr before accessing To: =?UTF-8?Q?Ilpo_J=C3=A4rvinen?= Cc: Bjorn Helgaas , Andy Shevchenko , linux-pci@vger.kernel.org References: <20251211120540.3362-1-kanie@linux.alibaba.com> <20251211120540.3362-3-kanie@linux.alibaba.com> <53567985-e55f-0a0e-5dfb-54c387d771a4@linux.intel.com> From: Guixin Liu In-Reply-To: <53567985-e55f-0a0e-5dfb-54c387d771a4@linux.intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 在 2025/12/11 20:17, Ilpo Järvinen 写道: > On Thu, 11 Dec 2025, Guixin Liu wrote: > >> 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 = 0x0000000096000021 >> EC = 0x25: DABT (current EL), IL = 32 bits >> SET = 0, FnV = 0 >> EA = 0, S1PTW = 0 >> FSC = 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 resource window") >> Suggested-by: Guanghui Feng >> Signed-off-by: Guixin Liu >> Reviewed-by: Andy Shevchenko >> --- >> drivers/pci/rom.c | 116 ++++++++++++++++++++++++++++++++++++++-------- >> 1 file changed, 97 insertions(+), 19 deletions(-) >> >> diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c >> index 3cb0e94f0e86..52a89e126271 100644 >> --- a/drivers/pci/rom.c >> +++ b/drivers/pci/rom.c >> @@ -6,9 +6,12 @@ >> * (C) Copyright 2004 Silicon Graphics, Inc. Jesse Barnes >> */ >> >> +#include >> #include >> -#include >> #include >> +#include >> +#include >> +#include >> #include >> #include >> >> @@ -81,6 +84,91 @@ void pci_disable_rom(struct pci_dev *pdev) >> } >> EXPORT_SYMBOL_GPL(pci_disable_rom); >> >> +static bool pci_rom_is_header_valid(struct pci_dev *pdev, >> + void __iomem *image, >> + void __iomem *rom, >> + size_t size, >> + bool last_image) >> +{ >> + unsigned long rom_end = (unsigned long)rom + size - 1; >> + unsigned long header_end; >> + unsigned short signature; > Please use u16 (to match readw return type). > OK. >> + >> + /* >> + * 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((unsigned long)image, 2)) >> + return false; >> + >> + if (check_add_overflow((unsigned long)image, PCI_ROM_HEADER_SIZE, >> + &header_end)) >> + return false; >> + >> + if (image < rom || header_end > rom_end) >> + return false; >> + >> + /* Standard PCI ROMs start out with these bytes 55 AA */ >> + signature = readw(image); >> + if (signature == PCI_ROM_IMAGE_SIGNATURE) >> + return true; >> + >> + if (last_image) { >> + pci_info(pdev, "Invalid PCI ROM header signature: expecting %#06x, got %#06x\n", >> + PCI_ROM_IMAGE_SIGNATURE, signature); >> + } else { >> + pci_info(pdev, "No more image in the PCI ROM\n"); >> + } >> + >> + return false; >> +} >> + >> +static bool pci_rom_is_data_struct_valid(struct pci_dev *pdev, >> + void __iomem *pds, >> + void __iomem *rom, >> + size_t size) >> +{ >> + unsigned long rom_end = (unsigned long)rom + size - 1; >> + unsigned int signature; > u32. OK. Thanks, I will change this immediately. Best Regards, Guixin Liu > >> + unsigned long 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((unsigned long)pds, 4)) >> + return false; >> + >> + /* Before reading length, check addr range. */ >> + if (check_add_overflow((unsigned long)pds, PCI_ROM_DATA_STRUCT_LEN + 1, >> + &end)) >> + return false; >> + >> + if (pds < rom || end > rom_end) >> + return false; >> + >> + data_len = readw(pds + PCI_ROM_DATA_STRUCT_LEN); >> + if (!data_len || data_len == U16_MAX) >> + return false; >> + >> + if (check_add_overflow((unsigned long)pds, data_len, &end)) >> + return false; >> + >> + if (end > rom_end) >> + return false; >> + >> + signature = readl(pds); >> + if (signature == PCI_ROM_DATA_STRUCT_SIGNATURE) >> + return true; >> + >> + pci_info(pdev, "Invalid PCI ROM data signature: expecting %#010x, got %#010x\n", >> + PCI_ROM_DATA_STRUCT_SIGNATURE, signature); >> + return false; >> +} >> + >> /** >> * pci_get_rom_size - obtain the actual size of the ROM image >> * @pdev: target PCI device >> @@ -96,38 +184,28 @@ static size_t pci_get_rom_size(struct pci_dev *pdev, void __iomem *rom, >> size_t size) >> { >> void __iomem *image; >> - int last_image; >> unsigned int length; >> + bool last_image; >> >> image = rom; >> do { >> void __iomem *pds; >> - /* Standard PCI ROMs start out with these bytes 55 AA */ >> - if (readw(image) != PCI_ROM_IMAGE_SIGNATURE) { >> - pci_info(pdev, "Invalid PCI ROM header signature: expecting %#06x, got %#06x\n", >> - PCI_ROM_IMAGE_SIGNATURE, readw(image)); >> + >> + if (!pci_rom_is_header_valid(pdev, image, rom, size, true)) >> break; >> - } >> + >> /* get the PCI data structure and check its "PCIR" signature */ >> pds = image + readw(image + PCI_ROM_POINTER_TO_DATA_STRUCT); >> - if (readl(pds) != PCI_ROM_DATA_STRUCT_SIGNATURE) { >> - pci_info(pdev, "Invalid PCI ROM data signature: expecting %#010x, got %#010x\n", >> - PCI_ROM_DATA_STRUCT_SIGNATURE, readl(pds)); >> + if (!pci_rom_is_data_struct_valid(pdev, pds, rom, size)) >> break; >> - } >> + >> last_image = readb(pds + PCI_ROM_LAST_IMAGE_INDICATOR) & >> PCI_ROM_LAST_IMAGE_INDICATOR_BIT; >> length = readw(pds + PCI_ROM_IMAGE_LEN); >> image += length * PCI_ROM_IMAGE_LEN_UNIT_SZ_512; >> - /* Avoid iterating through memory outside the resource window */ >> - if (image >= rom + size) >> + >> + if (!pci_rom_is_header_valid(pdev, image, rom, size, last_image)) >> break; >> - if (!last_image) { >> - if (readw(image) != PCI_ROM_IMAGE_SIGNATURE) { >> - pci_info(pdev, "No more image in the PCI ROM\n"); >> - break; >> - } >> - } >> } while (length && !last_image); >> >> /* never return a size larger than the PCI resource window */ >>