Commit b3281eb5 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Bjorn Helgaas
Browse files

PCI: Always have realloc_head in __assign_resources_sorted() 

Add a dummy list to always have a non-NULL realloc head in
__assign_resources_sorted() as it allows only checking list_empty().

In future, it would be good to ensure all callers provide a valid
realloc_head but that is relatively complex to do in practice and not
necessary for the subsequent optional resource handling fix.

Link: https://lore.kernel.org/r/20241216175632.4175-21-ilpo.jarvinen@linux.intel.com


Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Tested-by: default avatarXiaochun Lee <lixc17@lenovo.com>
parent 9caf4ea2

drivers/pci/setup-bus.c

+6 −2
Original line number Diff line number Diff line
@@ -400,14 +400,18 @@ static void __assign_resources_sorted(struct list_head *head, 
	 */

	LIST_HEAD(save_head);

	LIST_HEAD(local_fail_head);

	LIST_HEAD(dummy_head);

	struct pci_dev_resource *save_res;

	struct pci_dev_resource *dev_res, *tmp_res, *dev_res2;

	struct resource *res;

	unsigned long fail_type;

	resource_size_t add_align, align;



	if (!realloc_head)

		realloc_head = &dummy_head;



	/* Check if optional add_size is there */

	if (!realloc_head || list_empty(realloc_head))

	if (list_empty(realloc_head))

		goto requested_and_reassign;



	/* Save original start, end, flags etc at first */
@@ -503,7 +507,7 @@ static void __assign_resources_sorted(struct list_head *head, 
	assign_requested_resources_sorted(head, fail_head);



	/* Try to satisfy any additional optional resource requests */

	if (realloc_head)

	if (!list_empty(realloc_head))

		reassign_resources_sorted(realloc_head, head);



out: