Commit aa5f1199 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Jialin Zhang
Browse files

PCI: Avoid potential out-of-bounds read in pci_dev_for_each_resource()

stable inclusion
from stable-v6.6.14
commit 5b3e25efe16e06779a9a7c7610217c1b921ec179
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I93L7H
CVE: CVE-2023-52466

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=5b3e25efe16e06779a9a7c7610217c1b921ec179



--------------------------------

[ Upstream commit 3171e46d677a668eed3086da78671f1e4f5b8405 ]

Coverity complains that pointer in the pci_dev_for_each_resource() may be
wrong, i.e., might be used for the out-of-bounds read.

There is no actual issue right now because we have another check afterwards
and the out-of-bounds read is not being performed. In any case it's better
code with this fixed, hence the proposed change.

As Jonas pointed out "It probably makes the code slightly less performant
as res will now be checked for being not NULL (which will always be true),
but I doubt it will be significant (or in any hot paths)."

Fixes: 09cc9006 ("PCI: Introduce pci_dev_for_each_resource()")
Reported-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Closes: https://lore.kernel.org/r/20230509182122.GA1259567@bhelgaas


Suggested-by: default avatarJonas Gorski <jonas.gorski@gmail.com>
Link: https://lore.kernel.org/r/20231030114218.2752236-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parent 3016126e
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -2143,12 +2143,12 @@ int pci_iobar_pfn(struct pci_dev *pdev, int bar, struct vm_area_struct *vma);

#define __pci_dev_for_each_res0(dev, res, ...)				  \
	for (unsigned int __b = 0;					  \
	     res = pci_resource_n(dev, __b), __b < PCI_NUM_RESOURCES;	\
	     __b < PCI_NUM_RESOURCES && (res = pci_resource_n(dev, __b)); \
	     __b++)

#define __pci_dev_for_each_res1(dev, res, __b)				  \
	for (__b = 0;							  \
	     res = pci_resource_n(dev, __b), __b < PCI_NUM_RESOURCES;	\
	     __b < PCI_NUM_RESOURCES && (res = pci_resource_n(dev, __b)); \
	     __b++)

#define pci_dev_for_each_resource(dev, res, ...)			\