Merge tag 'firewire-fixes-7.2-final' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394

83a4f90e · Linus Torvalds <[email protected]> · 2026-08-13 07:31:21 -07:00

Pull firewire fix from Takashi Sakamoto:
 "Fix a NULL pointer dereference in 1394 OHCI PCI driver when probe()
  returns early with an error, as detected by Syzkaller"

* tag 'firewire-fixes-7.2-final' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
  firewire: ohci: fix NULL pointer dereference in ar_context_release

Commit: 83a4f90e9835d3d61fe3dd39ffbbcac752467d09
Parents: b4f5144d · 42d217ad

Merge commit. Changes below are compared with the first parent: b4f5144d.

Changes

1 files changed · +3 −1

File	Status	Add	Del	Content
drivers/firewire/ohci.c	modified	+3	−1	View file

drivers/firewire/ohci.c

View file

diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index 8153d62..e947227 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -540,11 +540,13 @@ static void ar_context_link_page(struct ar_context *ctx, unsigned int index)
 
 static void ar_context_release(struct ar_context *ctx)
 {
-	struct device *dev = ctx->ohci->card.device;
+	struct device *dev;
 
 	if (!ctx->buffer)
 		return;
 
+	dev = ctx->ohci->card.device;
+
 	for (int i = 0; i < AR_BUFFERS; ++i) {
 		dma_addr_t dma_addr = ctx->dma_addrs[i];
 		if (dma_addr)