Module Name: src
Committed By: jakllsch
Date: Wed Dec 9 14:21:09 UTC 2020
Modified Files:
src/sys/dev/pci: xhci_pci.c
Log Message:
xhci_pci: avoid potential double free of interrupt handles
Found by Kouichi Hashikawa in PR 55855.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/pci/xhci_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/xhci_pci.c
diff -u src/sys/dev/pci/xhci_pci.c:1.25 src/sys/dev/pci/xhci_pci.c:1.26
--- src/sys/dev/pci/xhci_pci.c:1.25 Tue Oct 27 13:50:57 2020
+++ src/sys/dev/pci/xhci_pci.c Wed Dec 9 14:21:09 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci_pci.c,v 1.25 2020/10/27 13:50:57 skrll Exp $ */
+/* $NetBSD: xhci_pci.c,v 1.26 2020/12/09 14:21:09 jakllsch Exp $ */
/* OpenBSD: xhci_pci.c,v 1.4 2014/07/12 17:38:51 yuo Exp */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci_pci.c,v 1.25 2020/10/27 13:50:57 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci_pci.c,v 1.26 2020/12/09 14:21:09 jakllsch Exp $");
#ifdef _KERNEL_OPT
#include "opt_xhci_pci.h"
@@ -222,7 +222,7 @@ xhci_pci_attach(device_t parent, device_
xhci_intr, sc, device_xname(sc->sc_dev));
if (psc->sc_ih == NULL) {
pci_intr_release(pc, psc->sc_pihp, 1);
- psc->sc_ih = NULL;
+ psc->sc_pihp = NULL;
aprint_error_dev(self, "couldn't establish interrupt");
if (intrstr != NULL)
aprint_error(" at %s", intrstr);
