Module Name: src
Committed By: joerg
Date: Sun May 3 15:07:12 UTC 2015
Modified Files:
src/sys/dev/iscsi: iscsi_ioctl.c
Log Message:
Make sure callout is halted, not just stopped, before freeing memory.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/iscsi/iscsi_ioctl.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/iscsi/iscsi_ioctl.c
diff -u src/sys/dev/iscsi/iscsi_ioctl.c:1.6 src/sys/dev/iscsi/iscsi_ioctl.c:1.7
--- src/sys/dev/iscsi/iscsi_ioctl.c:1.6 Sat Dec 29 11:05:29 2012
+++ src/sys/dev/iscsi/iscsi_ioctl.c Sun May 3 15:07:12 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsi_ioctl.c,v 1.6 2012/12/29 11:05:29 mlelstv Exp $ */
+/* $NetBSD: iscsi_ioctl.c,v 1.7 2015/05/03 15:07:12 joerg Exp $ */
/*-
* Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@@ -1524,7 +1524,7 @@ iscsi_cleanup_thread(void *par)
while (conn->usecount > 0)
tsleep(conn, PWAIT, "finalwait", hz);
- callout_stop(&conn->timeout);
+ callout_halt(&conn->timeout, NULL);
closef(conn->sock);
free(conn, M_DEVBUF);
