Module Name: src
Committed By: snj
Date: Thu Feb 11 23:12:12 UTC 2016
Modified Files:
src/sys/external/bsd/drm2/linux [netbsd-7-0]: linux_work.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1086):
sys/external/bsd/drm2/linux/linux_work.c: revision 1.12
Avoid NULL dereference in linux_worker_intr() in WORK_DELAYED_CANCELLED case.
Potentially fixes PR#49560.
To generate a diff of this commit:
cvs rdiff -u -r1.7.2.1 -r1.7.2.1.2.1 \
src/sys/external/bsd/drm2/linux/linux_work.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/external/bsd/drm2/linux/linux_work.c
diff -u src/sys/external/bsd/drm2/linux/linux_work.c:1.7.2.1 src/sys/external/bsd/drm2/linux/linux_work.c:1.7.2.1.2.1
--- src/sys/external/bsd/drm2/linux/linux_work.c:1.7.2.1 Sun Sep 21 18:03:33 2014
+++ src/sys/external/bsd/drm2/linux/linux_work.c Thu Feb 11 23:12:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_work.c,v 1.7.2.1 2014/09/21 18:03:33 snj Exp $ */
+/* $NetBSD: linux_work.c,v 1.7.2.1.2.1 2016/02/11 23:12:12 snj Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_work.c,v 1.7.2.1 2014/09/21 18:03:33 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_work.c,v 1.7.2.1.2.1 2016/02/11 23:12:12 snj Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -849,7 +849,7 @@ linux_worker_intr(void *arg)
}
/* Either way, the callout is done. */
- TAILQ_REMOVE(&dw->work.w_wq->wq_delayed, dw, dw_entry);
+ TAILQ_REMOVE(&wq->wq_delayed, dw, dw_entry);
callout_destroy(&dw->dw_callout);
mutex_exit(&wq->wq_lock);
