Skip to contentSkip to conversation

PCI: Fix NULL dereference in SR-IOV VF creation error path

PATCH Applied Shay Drory 3 participants 4 messages Mar 10, 2025 – Apr 11, 2025 PCI

lore
Share & tools
lore

Shay Drory

author
#0 lore raw

PATCH v2 1/1 PCI: Fix NULL dereference in SR-IOV VF creation error path

Add proper cleanup when virtfn setup fails to prevent NULL pointer dereference during device removal. The kernel oops[1] occurred due to Incorrect error handling flow when pci_setup_device() fails.

Fix it by introducing pci_iov_scan_device() which handle virtfn allocation and setup properly, instead of invoking pci_stop_and_remove_bus_device() whenever pci_setup_device is failed. This prevents accessing partially initialized virtfn devices during removal.

[1]

BUG: kernel NULL pointer dereference, address: 00000000000000d0
PGD 0 P4D 0
Oops: Oops: 0000 [#1] SMP
CPU: 22 UID: 0 PID: 1151 Comm: bash Not tainted 6.13.0+ #1
Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.13.0-0-gf21b5a4aeb02-prebuilt.qemu.org 04/01/2014
RIP: 0010:device_del+0x3d/0x3d0
Call Trace:
 <TASK>
 ? __die+0x20/0x60
 ? page_fault_oops+0x150/0x3e0
 ? exc_page_fault+0x74/0x130
 ? asm_exc_page_fault+0x22/0x30
 ? device_del+0x3d/0x3d0
 pci_remove_bus_device+0x7c/0x100
 pci_iov_add_virtfn+0xfa/0x200
 sriov_enable+0x208/0x420
 mlx5_core_sriov_configure+0x6a/0x160 [mlx5_core]
 sriov_numvfs_store+0xae/0x1a0
 kernfs_fop_write_iter+0x109/0x1a0
 vfs_write+0x2c0/0x3e0
 ksys_write+0x62/0xd0
 do_syscall_64+0x4c/0x100
 entry_SYSCALL_64_after_hwframe+0x4b/0x53
Fixes e3f30d563a38 ("PCI: Make pci_destroy_dev() concurrent safe")
CC Keith Busch <[email protected]>
Change-Id I7cee1123c90ce184661470dcafab45cec919bc72

---
changes from v1:
- add pci_iov_scan_device() helper (Bjorn)

---
 drivers/pci/iov.c | 47 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 14 deletions(-)
drivers/pci/iov.c +33 -14
index 9e4770cdd4d5..9f08df0e7208 100644
@@ -285,23 +285,16 @@ const struct attribute_group sriov_vf_dev_attr_group = {
 	.is_visible = sriov_vf_attrs_are_visible,
 };
 
-int pci_iov_add_virtfn(struct pci_dev *dev, int id)
+static struct pci_dev *pci_iov_scan_device(struct pci_dev *dev, int id,
+					   struct pci_bus *bus)
 {
-	int i;
-	int rc = -ENOMEM;
-	u64 size;
-	struct pci_dev *virtfn;
-	struct resource *res;
 	struct pci_sriov *iov = dev->sriov;
-	struct pci_bus *bus;
-
-	bus = virtfn_add_bus(dev->bus, pci_iov_virtfn_bus(dev, id));
-	if (!bus)
-		goto failed;
+	struct pci_dev *virtfn;
+	int rc = -ENOMEM;
 
 	virtfn = pci_alloc_dev(bus);
 	if (!virtfn)
-		goto failed0;
+		return ERR_PTR(rc);
 
 	virtfn->devfn = pci_iov_virtfn_devfn(dev, id);
 	virtfn->vendor = dev->vendor;
@@ -314,8 +307,34 @@ int pci_iov_add_virtfn(struct pci_dev *dev, int id)
 		pci_read_vf_config_common(virtfn);
 
 	rc = pci_setup_device(virtfn);
-	if (rc)
-		goto failed1;
+	if (rc) {
+		pci_dev_put(dev);
+		pci_bus_put(virtfn->bus);
+		kfree(virtfn);
+		return ERR_PTR(rc);
+	}
+
+	return virtfn;
+}
+
+int pci_iov_add_virtfn(struct pci_dev *dev, int id)
+{
+	int i;
+	int rc = -ENOMEM;
+	u64 size;
+	struct pci_dev *virtfn;
+	struct resource *res;
+	struct pci_bus *bus;
+
+	bus = virtfn_add_bus(dev->bus, pci_iov_virtfn_bus(dev, id));
+	if (!bus)
+		goto failed;
+
+	virtfn = pci_iov_scan_device(dev, id, bus);
+	if (IS_ERR(virtfn)) {
+		rc = PTR_ERR(virtfn);
+		goto failed0;
+	}
 
 	virtfn->dev.parent = dev->dev.parent;
 	virtfn->multifunction = 0;
Signature · 1 line
2.38.1
#1 lore raw
Quoted 35 lines · Shay Drory

Add proper cleanup when virtfn setup fails to prevent NULL pointer dereference during device removal. The kernel oops[1] occurred due to Incorrect error handling flow when pci_setup_device() fails.

Fix it by introducing pci_iov_scan_device() which handle virtfn allocation and setup properly, instead of invoking pci_stop_and_remove_bus_device() whenever pci_setup_device is failed. This prevents accessing partially initialized virtfn devices during removal.

[1]

BUG: kernel NULL pointer dereference, address: 00000000000000d0
PGD 0 P4D 0
Oops: Oops: 0000 [#1] SMP
CPU: 22 UID: 0 PID: 1151 Comm: bash Not tainted 6.13.0+ #1
Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.13.0-0-gf21b5a4aeb02-prebuilt.qemu.org 04/01/2014
RIP: 0010:device_del+0x3d/0x3d0
Call Trace:
 <TASK>
 ? __die+0x20/0x60
 ? page_fault_oops+0x150/0x3e0
 ? exc_page_fault+0x74/0x130
 ? asm_exc_page_fault+0x22/0x30
 ? device_del+0x3d/0x3d0
 pci_remove_bus_device+0x7c/0x100
 pci_iov_add_virtfn+0xfa/0x200
 sriov_enable+0x208/0x420
 mlx5_core_sriov_configure+0x6a/0x160 [mlx5_core]
 sriov_numvfs_store+0xae/0x1a0
 kernfs_fop_write_iter+0x109/0x1a0
 vfs_write+0x2c0/0x3e0
 ksys_write+0x62/0xd0
 do_syscall_64+0x4c/0x100
 entry_SYSCALL_64_after_hwframe+0x4b/0x53
Quoted 4 lines
Fixes e3f30d563a38 ("PCI: Make pci_destroy_dev() concurrent safe")
CC Keith Busch <[email protected]>
Change-Id I7cee1123c90ce184661470dcafab45cec919bc72

Applied to pci/resource for v6.15, thanks!

I like how pci_iov_scan_device() turned out.

---

Quoted 79 lines

changes from v1:
- add pci_iov_scan_device() helper (Bjorn)

---
 drivers/pci/iov.c | 47 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 14 deletions(-)
drivers/pci/iov.c +33 -14
index 9e4770cdd4d5..9f08df0e7208 100644
@@ -285,23 +285,16 @@ const struct attribute_group sriov_vf_dev_attr_group = {
 	.is_visible = sriov_vf_attrs_are_visible,
 };
 
-int pci_iov_add_virtfn(struct pci_dev *dev, int id)
+static struct pci_dev *pci_iov_scan_device(struct pci_dev *dev, int id,
+					   struct pci_bus *bus)
 {
-	int i;
-	int rc = -ENOMEM;
-	u64 size;
-	struct pci_dev *virtfn;
-	struct resource *res;
 	struct pci_sriov *iov = dev->sriov;
-	struct pci_bus *bus;
-
-	bus = virtfn_add_bus(dev->bus, pci_iov_virtfn_bus(dev, id));
-	if (!bus)
-		goto failed;
+	struct pci_dev *virtfn;
+	int rc = -ENOMEM;
 
 	virtfn = pci_alloc_dev(bus);
 	if (!virtfn)
-		goto failed0;
+		return ERR_PTR(rc);
 
 	virtfn->devfn = pci_iov_virtfn_devfn(dev, id);
 	virtfn->vendor = dev->vendor;
@@ -314,8 +307,34 @@ int pci_iov_add_virtfn(struct pci_dev *dev, int id)
 		pci_read_vf_config_common(virtfn);
 
 	rc = pci_setup_device(virtfn);
-	if (rc)
-		goto failed1;
+	if (rc) {
+		pci_dev_put(dev);
+		pci_bus_put(virtfn->bus);
+		kfree(virtfn);
+		return ERR_PTR(rc);
+	}
+
+	return virtfn;
+}
+
+int pci_iov_add_virtfn(struct pci_dev *dev, int id)
+{
+	int i;
+	int rc = -ENOMEM;
+	u64 size;
+	struct pci_dev *virtfn;
+	struct resource *res;
+	struct pci_bus *bus;
+
+	bus = virtfn_add_bus(dev->bus, pci_iov_virtfn_bus(dev, id));
+	if (!bus)
+		goto failed;
+
+	virtfn = pci_iov_scan_device(dev, id, bus);
+	if (IS_ERR(virtfn)) {
+		rc = PTR_ERR(virtfn);
+		goto failed0;
+	}
 
 	virtfn->dev.parent = dev->dev.parent;
 	virtfn->multifunction = 0;
Signature · 1 line
2.38.1
#2 lore raw
In reply to Shay Drory

Hello Shay,

Quoted 9 lines · Shay Drory

Add proper cleanup when virtfn setup fails to prevent NULL pointer dereference during device removal. The kernel oops[1] occurred due to Incorrect error handling flow when pci_setup_device() fails.

Fix it by introducing pci_iov_scan_device() which handle virtfn allocation and setup properly, instead of invoking pci_stop_and_remove_bus_device() whenever pci_setup_device is failed. This prevents accessing partially initialized virtfn devices during removal.

I've found a regression on QuartzPro64 board with NVMe connected to PCIe port no longer probing on boot and bisected it down to this commit.

When reverting this commit on top of torvalds/master the issue is also fixed.

From what I see in the diff of before/after of kernel log messages:

https://xff.cz/dl/tmp/revert.log.patch

(- before revert, + after revert)

It looks like this patch moves the discovery of the SSD up in the timeline:

-pci 0000:01:00.0: [15b7:501a] type 00 class 0x010802 PCIe Endpoint -pci 0000:01:00.0: BAR 0 [mem 0x00000000-0x00003fff 64bit] -pci 0000:01:00.0: BAR 4 [mem 0x00000000-0x000000ff 64bit]

And later prevents this from happening somehow:

+pcieport 0000:00:00.0: bridge window [mem 0xf0200000-0xf02fffff]: assigned +pci 0000:01:00.0: BAR 0 [mem 0xf0200000-0xf0203fff 64bit]: assigned +pci 0000:01:00.0: BAR 4 [mem 0xf0204000-0xf02040ff 64bit]: assigned

I'm using pci=realloc kenel parameter with this board.

Full kernel logs of before revert and after revert:

https://xff.cz/dl/tmp/revert.log (post revert)
https://xff.cz/dl/tmp/pre-revert.log

Why would this patch change the probe order so much and maybe break pci=realloc?

Kind regards,

        o.  
Quoted 110 lines

[1]

BUG: kernel NULL pointer dereference, address: 00000000000000d0
PGD 0 P4D 0
Oops: Oops: 0000 [#1] SMP
CPU: 22 UID: 0 PID: 1151 Comm: bash Not tainted 6.13.0+ #1
Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.13.0-0-gf21b5a4aeb02-prebuilt.qemu.org 04/01/2014
RIP: 0010:device_del+0x3d/0x3d0
Call Trace:
 <TASK>
 ? __die+0x20/0x60
 ? page_fault_oops+0x150/0x3e0
 ? exc_page_fault+0x74/0x130
 ? asm_exc_page_fault+0x22/0x30
 ? device_del+0x3d/0x3d0
 pci_remove_bus_device+0x7c/0x100
 pci_iov_add_virtfn+0xfa/0x200
 sriov_enable+0x208/0x420
 mlx5_core_sriov_configure+0x6a/0x160 [mlx5_core]
 sriov_numvfs_store+0xae/0x1a0
 kernfs_fop_write_iter+0x109/0x1a0
 vfs_write+0x2c0/0x3e0
 ksys_write+0x62/0xd0
 do_syscall_64+0x4c/0x100
 entry_SYSCALL_64_after_hwframe+0x4b/0x53
Fixes e3f30d563a38 ("PCI: Make pci_destroy_dev() concurrent safe")
CC Keith Busch <[email protected]>
Change-Id I7cee1123c90ce184661470dcafab45cec919bc72

---
changes from v1:
- add pci_iov_scan_device() helper (Bjorn)

---
 drivers/pci/iov.c | 47 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 14 deletions(-)
drivers/pci/iov.c +33 -14
index 9e4770cdd4d5..9f08df0e7208 100644
@@ -285,23 +285,16 @@ const struct attribute_group sriov_vf_dev_attr_group = {
 	.is_visible = sriov_vf_attrs_are_visible,
 };
 
-int pci_iov_add_virtfn(struct pci_dev *dev, int id)
+static struct pci_dev *pci_iov_scan_device(struct pci_dev *dev, int id,
+					   struct pci_bus *bus)
 {
-	int i;
-	int rc = -ENOMEM;
-	u64 size;
-	struct pci_dev *virtfn;
-	struct resource *res;
 	struct pci_sriov *iov = dev->sriov;
-	struct pci_bus *bus;
-
-	bus = virtfn_add_bus(dev->bus, pci_iov_virtfn_bus(dev, id));
-	if (!bus)
-		goto failed;
+	struct pci_dev *virtfn;
+	int rc = -ENOMEM;
 
 	virtfn = pci_alloc_dev(bus);
 	if (!virtfn)
-		goto failed0;
+		return ERR_PTR(rc);
 
 	virtfn->devfn = pci_iov_virtfn_devfn(dev, id);
 	virtfn->vendor = dev->vendor;
@@ -314,8 +307,34 @@ int pci_iov_add_virtfn(struct pci_dev *dev, int id)
 		pci_read_vf_config_common(virtfn);
 
 	rc = pci_setup_device(virtfn);
-	if (rc)
-		goto failed1;
+	if (rc) {
+		pci_dev_put(dev);
+		pci_bus_put(virtfn->bus);
+		kfree(virtfn);
+		return ERR_PTR(rc);
+	}
+
+	return virtfn;
+}
+
+int pci_iov_add_virtfn(struct pci_dev *dev, int id)
+{
+	int i;
+	int rc = -ENOMEM;
+	u64 size;
+	struct pci_dev *virtfn;
+	struct resource *res;
+	struct pci_bus *bus;
+
+	bus = virtfn_add_bus(dev->bus, pci_iov_virtfn_bus(dev, id));
+	if (!bus)
+		goto failed;
+
+	virtfn = pci_iov_scan_device(dev, id, bus);
+	if (IS_ERR(virtfn)) {
+		rc = PTR_ERR(virtfn);
+		goto failed0;
+	}
 
 	virtfn->dev.parent = dev->dev.parent;
 	virtfn->multifunction = 0;
Signature · 1 line
2.38.1
#3 lore raw

Re: [PATCH v2] PCI: Fix NULL dereference in SR-IOV VF creation error path - REGRESSION

Quoted 41 lines · megi xff

Hello Shay,

Quoted 9 lines · Shay Drory

Add proper cleanup when virtfn setup fails to prevent NULL pointer dereference during device removal. The kernel oops[1] occurred due to Incorrect error handling flow when pci_setup_device() fails.

Fix it by introducing pci_iov_scan_device() which handle virtfn allocation and setup properly, instead of invoking pci_stop_and_remove_bus_device() whenever pci_setup_device is failed. This prevents accessing partially initialized virtfn devices during removal.

I've found a regression on QuartzPro64 board with NVMe connected to PCIe port no longer probing on boot and bisected it down to this commit.

When reverting this commit on top of torvalds/master the issue is also fixed.

From what I see in the diff of before/after of kernel log messages:

https://xff.cz/dl/tmp/revert.log.patch

(- before revert, + after revert)

It looks like this patch moves the discovery of the SSD up in the timeline:

(quoted diff) +0 -3
-pci 0000:01:00.0: [15b7:501a] type 00 class 0x010802 PCIe Endpoint
-pci 0000:01:00.0: BAR 0 [mem 0x00000000-0x00003fff 64bit]
-pci 0000:01:00.0: BAR 4 [mem 0x00000000-0x000000ff 64bit]

And later prevents this from happening somehow:

(quoted diff) +3 -0
+pcieport 0000:00:00.0: bridge window [mem 0xf0200000-0xf02fffff]: assigned
+pci 0000:01:00.0: BAR 0 [mem 0xf0200000-0xf0203fff 64bit]: assigned
+pci 0000:01:00.0: BAR 4 [mem 0xf0204000-0xf02040ff 64bit]: assigned

I'm using pci=realloc kenel parameter with this board.

Quoted 7 lines

Full kernel logs of before revert and after revert:

https://xff.cz/dl/tmp/revert.log (post revert)
https://xff.cz/dl/tmp/pre-revert.log

Why would this patch change the probe order so much and maybe break pci=realloc?

By further experimentation I figured the real culprit that affects the order of the initialization and breaks NVMe on QuartzPro64 and Orange Pi 5+ are these two commits (mainly the first one, but build fails without reverting the other, too):

2499f53484314 "PCI: Rework optional resource handling" 96336ec702643 "PCI: Perform reset_resource() and build fail list in sync"

Reverting this one just "fixed" the QuartzPro64 (but breakage and order of probing remained same on Orange Pi 5+). Reverting the above two commits fixed both boards at once.

"PCI: Rework optional resource handling" also makes more sense as a culprit for changes seen in the log, I guess.

Kind regards,

	o.
Quoted 113 lines

Kind regards,

        o.  
Quoted 110 lines

[1]

BUG: kernel NULL pointer dereference, address: 00000000000000d0
PGD 0 P4D 0
Oops: Oops: 0000 [#1] SMP
CPU: 22 UID: 0 PID: 1151 Comm: bash Not tainted 6.13.0+ #1
Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.13.0-0-gf21b5a4aeb02-prebuilt.qemu.org 04/01/2014
RIP: 0010:device_del+0x3d/0x3d0
Call Trace:
 <TASK>
 ? __die+0x20/0x60
 ? page_fault_oops+0x150/0x3e0
 ? exc_page_fault+0x74/0x130
 ? asm_exc_page_fault+0x22/0x30
 ? device_del+0x3d/0x3d0
 pci_remove_bus_device+0x7c/0x100
 pci_iov_add_virtfn+0xfa/0x200
 sriov_enable+0x208/0x420
 mlx5_core_sriov_configure+0x6a/0x160 [mlx5_core]
 sriov_numvfs_store+0xae/0x1a0
 kernfs_fop_write_iter+0x109/0x1a0
 vfs_write+0x2c0/0x3e0
 ksys_write+0x62/0xd0
 do_syscall_64+0x4c/0x100
 entry_SYSCALL_64_after_hwframe+0x4b/0x53
Fixes e3f30d563a38 ("PCI: Make pci_destroy_dev() concurrent safe")
CC Keith Busch <[email protected]>
Change-Id I7cee1123c90ce184661470dcafab45cec919bc72

---
changes from v1:
- add pci_iov_scan_device() helper (Bjorn)

---
 drivers/pci/iov.c | 47 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 14 deletions(-)
drivers/pci/iov.c +33 -14
index 9e4770cdd4d5..9f08df0e7208 100644
@@ -285,23 +285,16 @@ const struct attribute_group sriov_vf_dev_attr_group = {
 	.is_visible = sriov_vf_attrs_are_visible,
 };
 
-int pci_iov_add_virtfn(struct pci_dev *dev, int id)
+static struct pci_dev *pci_iov_scan_device(struct pci_dev *dev, int id,
+					   struct pci_bus *bus)
 {
-	int i;
-	int rc = -ENOMEM;
-	u64 size;
-	struct pci_dev *virtfn;
-	struct resource *res;
 	struct pci_sriov *iov = dev->sriov;
-	struct pci_bus *bus;
-
-	bus = virtfn_add_bus(dev->bus, pci_iov_virtfn_bus(dev, id));
-	if (!bus)
-		goto failed;
+	struct pci_dev *virtfn;
+	int rc = -ENOMEM;
 
 	virtfn = pci_alloc_dev(bus);
 	if (!virtfn)
-		goto failed0;
+		return ERR_PTR(rc);
 
 	virtfn->devfn = pci_iov_virtfn_devfn(dev, id);
 	virtfn->vendor = dev->vendor;
@@ -314,8 +307,34 @@ int pci_iov_add_virtfn(struct pci_dev *dev, int id)
 		pci_read_vf_config_common(virtfn);
 
 	rc = pci_setup_device(virtfn);
-	if (rc)
-		goto failed1;
+	if (rc) {
+		pci_dev_put(dev);
+		pci_bus_put(virtfn->bus);
+		kfree(virtfn);
+		return ERR_PTR(rc);
+	}
+
+	return virtfn;
+}
+
+int pci_iov_add_virtfn(struct pci_dev *dev, int id)
+{
+	int i;
+	int rc = -ENOMEM;
+	u64 size;
+	struct pci_dev *virtfn;
+	struct resource *res;
+	struct pci_bus *bus;
+
+	bus = virtfn_add_bus(dev->bus, pci_iov_virtfn_bus(dev, id));
+	if (!bus)
+		goto failed;
+
+	virtfn = pci_iov_scan_device(dev, id, bus);
+	if (IS_ERR(virtfn)) {
+		rc = PTR_ERR(virtfn);
+		goto failed0;
+	}
 
 	virtfn->dev.parent = dev->dev.parent;
 	virtfn->multifunction = 0;
Signature · 1 line
2.38.1