mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-03 09:00:21 +00:00
Don't get stuck in a loop calling exit from an atexit routine. Clean
up cam_fill_ctio usage to passed atio flags. Clear periph_priv area of new ctio so if the kernel is dumb enough to look at them (this is a SECURITY hole) the panic will be obvious instead of subtle.
This commit is contained in:
parent
ff1e937c46
commit
785b6ccaec
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=63375
@ -184,12 +184,9 @@ cleanup()
|
||||
(void) ioctl(targfd, TARGIODEBUG, &debug);
|
||||
}
|
||||
close(targfd);
|
||||
|
||||
if (ioctl(targctlfd, TARGCTLIOFREEUNIT, &alloc_unit) == -1) {
|
||||
perror("TARGCTLIOFREEUNIT");
|
||||
exit(EX_SOFTWARE);
|
||||
}
|
||||
|
||||
close(targctlfd);
|
||||
}
|
||||
|
||||
@ -326,18 +323,22 @@ handle_exception()
|
||||
}
|
||||
|
||||
bzero(&ccb, sizeof(ccb));
|
||||
cam_fill_ctio(&ccb.csio, /*retries*/2,
|
||||
cam_fill_ctio(&ccb.csio,
|
||||
/*retries*/2,
|
||||
/*cbfcnp*/NULL,
|
||||
/*flags*/CAM_DIR_NONE
|
||||
| (atio.ccb_h.flags & CAM_TAG_ACTION_VALID)
|
||||
| CAM_SEND_STATUS,
|
||||
/*tag_action*/MSG_SIMPLE_Q_TAG,
|
||||
CAM_DIR_NONE | CAM_SEND_STATUS,
|
||||
(atio.ccb_h.flags & CAM_TAG_ACTION_VALID)?
|
||||
MSG_SIMPLE_Q_TAG : 0,
|
||||
atio.tag_id,
|
||||
atio.init_id,
|
||||
SCSI_STATUS_CHECK_COND,
|
||||
/*data_ptr*/NULL,
|
||||
/*dxfer_len*/0,
|
||||
/*timeout*/5 * 1000);
|
||||
/*
|
||||
* Make sure that periph_priv pointers are clean.
|
||||
*/
|
||||
bzero(&ccb.ccb_h.periph_priv, sizeof ccb.ccb_h.periph_priv);
|
||||
|
||||
if (ioctl(targfd, TARGIOCCOMMAND, &ccb) == -1) {
|
||||
perror("TARGIOCCOMMAND");
|
||||
|
Loading…
Reference in New Issue
Block a user