d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix panic.

Browse Source 
- Don't call sbp_targ_status_FIFO() twice for LOGIN error.
- Don't access login if it's NULL.
This commit is contained in:
Hidetoshi Shimokawa 2003-12-13 15:33:45 +00:00
parent 4358431405
commit c54d1fe2bd
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/firewire/sbp_targ.c
View File

@ -235,7 +235,6 @@ sbp_targ_probe(device_t dev)
return (0);
}
static void
sbp_targ_dealloc_login(struct sbp_targ_login *login)
{
@ -1295,8 +1294,6 @@ sbp_targ_mgm_handler(struct fw_xfer *xfer)
orbi->status.dead = 1;
orbi->status.status = STATUS_ACCESS_DENY;
orbi->status.len = 1;
sbp_targ_status_FIFO(orbi, orb[6], orb[7],
/*dequeue*/0);
break;
}
@ -1308,8 +1305,6 @@ sbp_targ_mgm_handler(struct fw_xfer *xfer)
orbi->status.dead = 1;
orbi->status.status = STATUS_RES_UNAVAIL;
orbi->status.len = 1;
sbp_targ_status_FIFO(orbi, orb[6], orb[7],
/*dequeue*/0);
break;
}
@ -1325,6 +1320,7 @@ sbp_targ_mgm_handler(struct fw_xfer *xfer)
sizeof(struct sbp_login_res), (void *)&login->loginres,
fw_asy_callback_free);
STAILQ_INSERT_TAIL(&lstate->logins, login, link);
/* XXX return status after loginres is successfully written */
break;
}
case ORB_FUN_RCN:
@ -1338,7 +1334,7 @@ sbp_targ_mgm_handler(struct fw_xfer *xfer)
orbi->status.dead = 1;
orbi->status.status = STATUS_ACCESS_DENY;
printf("%s: reconnection faild id=%d\n",
__FUNCTION__, login->id);
__FUNCTION__, orb4->id);
}
break;
case ORB_FUN_LGO: