Module Name: src
Committed By: hannken
Date: Mon Jun 20 08:14:06 UTC 2016
Modified Files:
src/sys/arch/x86/x86: intr.c
Log Message:
Prevent use after free. Don't free an interrupt source still in use.
Ok: Kengo NAKAHARA
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/x86/x86/intr.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/arch/x86/x86/intr.c
diff -u src/sys/arch/x86/x86/intr.c:1.91 src/sys/arch/x86/x86/intr.c:1.92
--- src/sys/arch/x86/x86/intr.c:1.91 Tue Nov 17 10:34:04 2015
+++ src/sys/arch/x86/x86/intr.c Mon Jun 20 08:14:06 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.91 2015/11/17 10:34:04 hannken Exp $ */
+/* $NetBSD: intr.c,v 1.92 2016/06/20 08:14:06 hannken Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.91 2015/11/17 10:34:04 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.92 2016/06/20 08:14:06 hannken Exp $");
#include "opt_intrdebug.h"
#include "opt_multiprocessor.h"
@@ -612,6 +612,11 @@ intr_free_io_intrsource(const char *intr
return;
}
+ /* If the interrupt uses shared IRQ, don't free yet. */
+ if (isp->is_handlers != NULL) {
+ return;
+ }
+
intr_free_io_intrsource_direct(isp);
}
