[src/netbsd-7-0]: src/sys/external/bsd/drm2/linux Pull up following revision(...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/25f89833e511
branches:  netbsd-7-0
changeset: 801132:25f89833e511
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Feb 11 23:12:12 2016 +0000

description:
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.

diffstat:

 sys/external/bsd/drm2/linux/linux_work.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 578b62ca6a72 -r 25f89833e511 sys/external/bsd/drm2/linux/linux_work.c
--- a/sys/external/bsd/drm2/linux/linux_work.c  Sat Feb 06 21:34:37 2016 +0000
+++ b/sys/external/bsd/drm2/linux/linux_work.c  Thu Feb 11 23:12:12 2016 +0000
@@ -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 @@
        }
 
        /* 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);