Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/scsipi CID 1396620: Null pointer dereferences



details:   https://anonhg.NetBSD.org/src/rev/fb5552eb76e3
branches:  trunk
changeset: 349234:fb5552eb76e3
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Thu Dec 01 15:39:02 2016 +0000

description:
CID 1396620: Null pointer dereferences

diffstat:

 sys/dev/scsipi/scsiconf.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r c6bdcddd915d -r fb5552eb76e3 sys/dev/scsipi/scsiconf.c
--- a/sys/dev/scsipi/scsiconf.c Thu Dec 01 14:49:03 2016 +0000
+++ b/sys/dev/scsipi/scsiconf.c Thu Dec 01 15:39:02 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsiconf.c,v 1.277 2016/11/29 03:23:00 mlelstv Exp $   */
+/*     $NetBSD: scsiconf.c,v 1.278 2016/12/01 15:39:02 mlelstv Exp $   */
 
 /*-
  * Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.277 2016/11/29 03:23:00 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.278 2016/12/01 15:39:02 mlelstv Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -470,7 +470,7 @@
        mutex_enter(chan_mtx(chan));
 
        periph = scsipi_lookup_periph_locked(chan, target, lun);
-       KASSERT(periph->periph_dev == child);
+       KASSERT(periph != NULL && periph->periph_dev == child);
 
        scsipi_remove_periph(chan, periph);
        scsipi_free_periph(periph);



Home | Main Index | Thread Index | Old Index