[src/trunk]: src/sys/external/bsd/drm2/linux Avoid NULL dereference in linux_...

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

details:   https://anonhg.NetBSD.org/src/rev/649f30d05e03
branches:  trunk
changeset: 341654:649f30d05e03
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Sun Nov 15 22:56:24 2015 +0000

description:
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 98f6fd716e56 -r 649f30d05e03 sys/external/bsd/drm2/linux/linux_work.c
--- a/sys/external/bsd/drm2/linux/linux_work.c  Sun Nov 15 21:31:29 2015 +0000
+++ b/sys/external/bsd/drm2/linux/linux_work.c  Sun Nov 15 22:56:24 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_work.c,v 1.11 2015/10/17 15:57:32 jmcneill Exp $ */
+/*     $NetBSD: linux_work.c,v 1.12 2015/11/15 22:56:24 jakllsch 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.11 2015/10/17 15:57:32 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_work.c,v 1.12 2015/11/15 22:56:24 jakllsch Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -850,7 +850,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);