diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2024-05-17 02:14:11 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2024-05-17 02:14:11 +0300 |
| commit | cf29111d3e4a9ebe1cbe2b431274718506d69f10 (patch) | |
| tree | 991ff78b41b8194a44b365e4282105eeb35d36cc /drivers/pci | |
| parent | ed11a28cb709a9ab69c4cd4e0669079a455f9a8d (diff) | |
| parent | e6f7d27df5d208b50cae817a91d128fb434bb12c (diff) | |
| download | linux-cf29111d3e4a9ebe1cbe2b431274718506d69f10.tar.xz | |
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
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/of_property.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/of_property.c b/drivers/pci/of_property.c index c2c7334152bc..03539e505372 100644 --- 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) { |