TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PCI: Bounds-check command-line resource alignment requests

Browse Source 
32-bit BARs are limited to 2GB size (2^31).  By extension, I assume 64-bit
BARs are limited to 2^63 bytes.  Limit the alignment requested by the
"pci=resource_alignment=" command-line parameter to 2^63.

Link: https://lore.kernel.org/r/20201007123045.GS4282@kadam
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Bjorn Helgaas
2020-11-05 14:51:36 -06:00
parent 2f0cd59c6f
commit 6534aac198
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/pci/pci.c
+6 -4
View File
@@ -6204,16 +6204,18 @@ static resource_size_t pci_specified_resource_alignment(struct pci_dev *dev,
if (sscanf(p, "%d%n", &align_order, &count) == 1 && if (sscanf(p, "%d%n", &align_order, &count) == 1 &&
p[count] == '@') { p[count] == '@') {
p += count + 1; p += count + 1;
if (align_order > 63) {
pr_err("PCI: Invalid requested alignment (order %d)\n",
align_order);
align_order = PAGE_SHIFT;
}
} else { } else {
align_order = -1; align_order = PAGE_SHIFT;
} }
ret = pci_dev_str_match(dev, p, &p); ret = pci_dev_str_match(dev, p, &p);
if (ret == 1) { if (ret == 1) {
*resize = true; *resize = true;
if (align_order == -1)
align = PAGE_SIZE;
else
align = 1 << align_order; align = 1 << align_order;
break; break;
} else if (ret < 0) { } else if (ret < 0) {