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

Fix few minor issues found by Clang Analyzer.

Browse Source 
MFC after:	2 weeks
This commit is contained in:
Alexander Motin 2017-04-09 07:54:39 +00:00
parent e9da70a35e
commit bb8cea1b21
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/cam/ctl/ctl.c
View File

@ -7047,7 +7047,7 @@ ctl_get_lba_status(struct ctl_scsiio *ctsio)
lbalen->len = total_len; lbalen->len = total_len;
lbalen->flags = 0; lbalen->flags = 0;
retval = lun->backend->config_read((union ctl_io *)ctsio); retval = lun->backend->config_read((union ctl_io *)ctsio);
return (CTL_RETVAL_COMPLETE); return (retval);
} }
int int

12
sys/cam/ctl/ctl_frontend_iscsi.c
View File

@ -321,11 +321,10 @@ cfiscsi_pdu_handle(struct icl_pdu *request)
static void static void
cfiscsi_receive_callback(struct icl_pdu *request) cfiscsi_receive_callback(struct icl_pdu *request)
{ {
#ifdef ICL_KERNEL_PROXY
struct cfiscsi_session *cs; struct cfiscsi_session *cs;
cs = PDU_SESSION(request); cs = PDU_SESSION(request);
#ifdef ICL_KERNEL_PROXY
if (cs->cs_waiting_for_ctld || cs->cs_login_phase) { if (cs->cs_waiting_for_ctld || cs->cs_login_phase) {
if (cs->cs_login_pdu == NULL) if (cs->cs_login_pdu == NULL)
cs->cs_login_pdu = request; cs->cs_login_pdu = request;
@ -1709,6 +1708,13 @@ cfiscsi_ioctl_list(struct ctl_iscsi *ci)
sbuf_finish(sb); sbuf_finish(sb);
error = copyout(sbuf_data(sb), cilp->conn_xml, sbuf_len(sb) + 1); error = copyout(sbuf_data(sb), cilp->conn_xml, sbuf_len(sb) + 1);
if (error != 0) {
sbuf_delete(sb);
snprintf(ci->error_str, sizeof(ci->error_str),
"copyout failed with error %d", error);
ci->status = CTL_ISCSI_ERROR;
return;
}
cilp->fill_len = sbuf_len(sb) + 1; cilp->fill_len = sbuf_len(sb) + 1;
ci->status = CTL_ISCSI_OK; ci->status = CTL_ISCSI_OK;
sbuf_delete(sb); sbuf_delete(sb);
@ -2163,9 +2169,9 @@ cfiscsi_ioctl_port_create(struct ctl_req *req)
retval = ctl_port_register(port); retval = ctl_port_register(port);
if (retval != 0) { if (retval != 0) {
ctl_free_opts(&port->options); ctl_free_opts(&port->options);
cfiscsi_target_release(ct);
free(port->port_devid, M_CFISCSI); free(port->port_devid, M_CFISCSI);
free(port->target_devid, M_CFISCSI); free(port->target_devid, M_CFISCSI);
cfiscsi_target_release(ct);
req->status = CTL_LUN_ERROR; req->status = CTL_LUN_ERROR;
snprintf(req->error_str, sizeof(req->error_str), snprintf(req->error_str, sizeof(req->error_str),
"ctl_port_register() failed with error %d", retval); "ctl_port_register() failed with error %d", retval);