Unverified Commit ec8c5f98 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10361 PCI/ROM: Fix PCI ROM header check bug 

Merge Pull Request from: @ci-robot 
 
PR sync from: liwei <liwei728@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/EPKC27CVQR3PZVPA34R4RN4R4AZDK6NO/ 
 
https://gitee.com/openeuler/kernel/issues/IAEDJI 
 
Link:https://gitee.com/openeuler/kernel/pulls/10361

 

Reviewed-by: default avatarWei Li <liwei391@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 06ed1b21 05e7a9d2

drivers/pci/rom.c

+6 −0
Original line number Diff line number Diff line
@@ -98,6 +98,12 @@ static size_t pci_get_rom_size(struct pci_dev *pdev, void __iomem *rom, 
		}

		/* get the PCI data structure and check its "PCIR" signature */

		pds = image + readw(image + 24);

		/* The PCIR data structure must begin on a 4-byte boundary */

		if (!IS_ALIGNED((unsigned long)pds, 4)) {

			pci_info(pdev, "Invalid PCI ROM header signature: PCIR %#06x\n",

				 readw(image + 24));

			break;

		}

		if (readl(pds) != 0x52494350) {

			pci_info(pdev, "Invalid PCI ROM data signature: expecting 0x52494350, got %#010x\n",

				 readl(pds));