From 8636f91142ab12b303520ff3d318b5eebb36b627 Mon Sep 17 00:00:00 2001 From: rpaulo Date: Tue, 11 Apr 2006 15:52:07 +0000 Subject: [PATCH] Coverity ID 2443: In sbp_scsipi_detach_sdev() check for sdev and target being NULL before dereferencing them. --- sys/dev/ieee1394/sbp.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/sys/dev/ieee1394/sbp.c b/sys/dev/ieee1394/sbp.c index d91d8bd3e707..6578fe47b660 100644 --- a/sys/dev/ieee1394/sbp.c +++ b/sys/dev/ieee1394/sbp.c @@ -1,4 +1,4 @@ -/* $NetBSD: sbp.c,v 1.6 2006/03/28 17:38:33 thorpej Exp $ */ +/* $NetBSD: sbp.c,v 1.7 2006/04/11 15:52:07 rpaulo Exp $ */ /*- * Copyright (c) 2003 Hidetoshi Shimokawa * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa @@ -2332,10 +2332,18 @@ END_DEBUG static void sbp_scsipi_detach_sdev(struct sbp_dev *sdev) { - struct sbp_target *target = sdev->target; - struct sbp_softc *sbp = target->sbp; + struct sbp_target *target; + struct sbp_softc *sbp; + if (sdev == NULL) return; + + target = sdev->target; + if (target == NULL) + return; + + sbp = target->sbp; + if (sdev->status == SBP_DEV_DEAD) return; if (sdev->status == SBP_DEV_RESET)