Date: Wed, 20 Apr 2011 07:11:26 GMT From: Henning Petersen <henning.petersen@t-online.de> To: freebsd-gnats-submit@FreeBSD.org Subject: kern/156513: Missing check of scb. Message-ID: <201104200711.p3K7BQ9S091277@red.freebsd.org> Resent-Message-ID: <201104200720.p3K7K8iH041703@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 156513
>Category: kern
>Synopsis: Missing check of scb.
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Wed Apr 20 07:20:08 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Henning Petersen
>Release: FreeBSD-current
>Organization:
>Environment:
>Description:
Missing check of scb != NULL.
Remove debug printf.
Remove unused variable.
>How-To-Repeat:
>Fix:
diff -u -r1.42 aic79xx.c
--- sys/dev/aic7xxx/aic79xx.c 12 Mar 2011 20:36:52 -0000 1.42
+++ sys/dev/aic7xxx/aic79xx.c 20 Apr 2011 06:56:47 -0000
@@ -1062,7 +1062,6 @@
struct scb *scb;
struct ahd_initiator_tinfo *targ_info;
struct ahd_tmode_tstate *tstate;
- struct ahd_transinfo *tinfo;
u_int scbid;
/*
@@ -1096,7 +1095,6 @@
devinfo.our_scsiid,
devinfo.target,
&tstate);
- tinfo = &targ_info->curr;
ahd_set_width(ahd, &devinfo, MSG_EXT_WDTR_BUS_8_BIT,
AHD_TRANS_ACTIVE, /*paused*/TRUE);
ahd_set_syncrate(ahd, &devinfo, /*period*/0,
@@ -2262,7 +2260,6 @@
found = ahd_abort_scbs(ahd, target, 'A', saved_lun,
tag, ROLE_INITIATOR,
CAM_REQ_ABORTED);
- printf("found == 0x%x\n", found);
printerror = 0;
} else if (ahd_sent_msg(ahd, AHDMSG_1B,
MSG_BUS_DEV_RESET, TRUE)) {
@@ -2406,7 +2403,8 @@
*/
if (printerror != 0
&& (lastphase == P_MESGIN || lastphase == P_MESGOUT)
- && ((ahd->msg_flags & MSG_FLAG_EXPECT_PPR_BUSFREE) != 0)) {
+ && ((ahd->msg_flags & MSG_FLAG_EXPECT_PPR_BUSFREE) != 0)
+ && scb != NULL) {
ahd_freeze_devq(ahd, scb);
aic_set_transaction_status(scb, CAM_REQUEUE_REQ);
Patch attached with submission follows:
diff -u -r1.42 aic79xx.c
--- sys/dev/aic7xxx/aic79xx.c 12 Mar 2011 20:36:52 -0000 1.42
+++ sys/dev/aic7xxx/aic79xx.c 20 Apr 2011 06:56:47 -0000
@@ -1062,7 +1062,6 @@
struct scb *scb;
struct ahd_initiator_tinfo *targ_info;
struct ahd_tmode_tstate *tstate;
- struct ahd_transinfo *tinfo;
u_int scbid;
/*
@@ -1096,7 +1095,6 @@
devinfo.our_scsiid,
devinfo.target,
&tstate);
- tinfo = &targ_info->curr;
ahd_set_width(ahd, &devinfo, MSG_EXT_WDTR_BUS_8_BIT,
AHD_TRANS_ACTIVE, /*paused*/TRUE);
ahd_set_syncrate(ahd, &devinfo, /*period*/0,
@@ -2262,7 +2260,6 @@
found = ahd_abort_scbs(ahd, target, 'A', saved_lun,
tag, ROLE_INITIATOR,
CAM_REQ_ABORTED);
- printf("found == 0x%x\n", found);
printerror = 0;
} else if (ahd_sent_msg(ahd, AHDMSG_1B,
MSG_BUS_DEV_RESET, TRUE)) {
@@ -2406,7 +2403,8 @@
*/
if (printerror != 0
&& (lastphase == P_MESGIN || lastphase == P_MESGOUT)
- && ((ahd->msg_flags & MSG_FLAG_EXPECT_PPR_BUSFREE) != 0)) {
+ && ((ahd->msg_flags & MSG_FLAG_EXPECT_PPR_BUSFREE) != 0)
+ && scb != NULL) {
ahd_freeze_devq(ahd, scb);
aic_set_transaction_status(scb, CAM_REQUEUE_REQ);
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104200711.p3K7BQ9S091277>