Skip to content

Commit 934e9d1

Browse files
Christian Bruelkwilczynski
authored andcommitted
PCI: endpoint: pci-epf-test: Fix double free that causes kernel to oops
Fix a kernel oops found while testing the stm32_pcie Endpoint driver with handling of PERST# deassertion: During EP initialization, pci_epf_test_alloc_space() allocates all BARs, which are further freed if epc_set_bar() fails (for instance, due to no free inbound window). However, when pci_epc_set_bar() fails, the error path: pci_epc_set_bar() -> pci_epf_free_space() does not clear the previous assignment to epf_test->reg[bar]. Then, if the host reboots, the PERST# deassertion restarts the BAR allocation sequence with the same allocation failure (no free inbound window), creating a double free situation since epf_test->reg[bar] was deallocated and is still non-NULL. Thus, make sure that pci_epf_alloc_space() and pci_epf_free_space() invocations are symmetric, and as such, set epf_test->reg[bar] to NULL when memory is freed. Reviewed-by: Niklas Cassel <[email protected]> Reviewed-by: Manivannan Sadhasivam <[email protected]> Signed-off-by: Christian Bruel <[email protected]> Link: https://lore.kernel.org/r/[email protected] [kwilczynski: commit log] Signed-off-by: Krzysztof Wilczyński <[email protected]>
1 parent 22a0117 commit 934e9d1

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

drivers/pci/endpoint/functions/pci-epf-test.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -738,6 +738,7 @@ static int pci_epf_test_set_bar(struct pci_epf *epf)
738738
if (ret) {
739739
pci_epf_free_space(epf, epf_test->reg[bar], bar,
740740
PRIMARY_INTERFACE);
741+
epf_test->reg[bar] = NULL;
741742
dev_err(dev, "Failed to set BAR%d\n", bar);
742743
if (bar == test_reg_bar)
743744
return ret;
@@ -929,6 +930,7 @@ static void pci_epf_test_free_space(struct pci_epf *epf)
929930

930931
pci_epf_free_space(epf, epf_test->reg[bar], bar,
931932
PRIMARY_INTERFACE);
933+
epf_test->reg[bar] = NULL;
932934
}
933935
}
934936

0 commit comments

Comments
 (0)