Merge branch 'pci/of'

- Check for kcalloc() failure and handle it gracefully (Duoming Zhou) * pci/of: PCI: of_property: Return error for int_map allocation failure
caleberi · May 16, 2024 · cf29111 · cf29111
2 parents ed11a28 + e6f7d27
commit cf29111
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/drivers/pci/of_property.c b/drivers/pci/of_property.c
@@ -238,6 +238,8 @@ static int of_pci_prop_intr_map(struct pci_dev *pdev, struct of_changeset *ocs,
 		return 0;
 
 	int_map = kcalloc(map_sz, sizeof(u32), GFP_KERNEL);
+	if (!int_map)
+		return -ENOMEM;
 	mapp = int_map;
 
 	list_for_each_entry(child, &pdev->subordinate->devices, bus_list) {