ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/unit: fix scan-build errors in iscsi tests

Browse Source 
One was an API issue, another was a dereference of a null pointer that
resulted from a possible call to a stubbed function in the unittest
common code, and the last was an erroneous use-after-free due to
scan-build apparently not understanding TAILQ_REMOVE.

Change-Id: I9111817e9e990ff6e388351c08f34c2e945df62d
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/423959
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Seth Howell 2018-08-29 15:28:21 -07:00 committed by Jim Harris
parent 14ccaed6de
commit 93edd7b023
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/iscsi/iscsi.c
View File

@ -3058,6 +3058,7 @@ void spdk_iscsi_task_response(struct spdk_iscsi_conn *conn,
/* response PDU */ /* response PDU */
rsp_pdu = spdk_get_pdu(); rsp_pdu = spdk_get_pdu();
assert(rsp_pdu != NULL);
rsph = (struct iscsi_bhs_scsi_resp *)&rsp_pdu->bhs; rsph = (struct iscsi_bhs_scsi_resp *)&rsp_pdu->bhs;
assert(task->scsi.sense_data_len <= sizeof(rsp_pdu->sense.data)); assert(task->scsi.sense_data_len <= sizeof(rsp_pdu->sense.data));
memcpy(rsp_pdu->sense.data, task->scsi.sense_data, task->scsi.sense_data_len); memcpy(rsp_pdu->sense.data, task->scsi.sense_data, task->scsi.sense_data_len);

2
test/unit/lib/iscsi/common.c
View File

@ -6,6 +6,7 @@
#include "spdk/env.h" #include "spdk/env.h"
#include "spdk/event.h" #include "spdk/event.h"
#include "spdk/sock.h" #include "spdk/sock.h"
#include "spdk_cunit.h"
#include "spdk_internal/log.h" #include "spdk_internal/log.h"
@ -249,6 +250,7 @@ spdk_scsi_task_set_status(struct spdk_scsi_task *task, int sc, int sk, int asc,
void void
spdk_scsi_task_set_data(struct spdk_scsi_task *task, void *data, uint32_t len) spdk_scsi_task_set_data(struct spdk_scsi_task *task, void *data, uint32_t len)
{ {
SPDK_CU_ASSERT_FATAL(task->iovs != NULL);
task->iovs[0].iov_base = data; task->iovs[0].iov_base = data;
task->iovs[0].iov_len = len; task->iovs[0].iov_len = len;
} }

38
test/unit/lib/iscsi/iscsi.c/iscsi_ut.c
View File

@ -386,7 +386,7 @@ underflow_for_request_sense_test(void)
struct spdk_iscsi_sess sess; struct spdk_iscsi_sess sess;
struct spdk_iscsi_conn conn; struct spdk_iscsi_conn conn;
struct spdk_iscsi_task task; struct spdk_iscsi_task task;
struct spdk_iscsi_pdu *pdu; struct spdk_iscsi_pdu *pdu1, *pdu2;
struct iscsi_bhs_scsi_req *scsi_req; struct iscsi_bhs_scsi_req *scsi_req;
struct iscsi_bhs_data_in *datah; struct iscsi_bhs_data_in *datah;
struct iscsi_bhs_scsi_resp *resph; struct iscsi_bhs_scsi_resp *resph;
@ -403,13 +403,13 @@ underflow_for_request_sense_test(void)
conn.sess = &sess; conn.sess = &sess;
conn.MaxRecvDataSegmentLength = 8192; conn.MaxRecvDataSegmentLength = 8192;
pdu = spdk_get_pdu(); pdu1 = spdk_get_pdu();
SPDK_CU_ASSERT_FATAL(pdu != NULL); SPDK_CU_ASSERT_FATAL(pdu1 != NULL);
scsi_req = (struct iscsi_bhs_scsi_req *)&pdu->bhs; scsi_req = (struct iscsi_bhs_scsi_req *)&pdu1->bhs;
scsi_req->read_bit = 1; scsi_req->read_bit = 1;
spdk_iscsi_task_set_pdu(&task, pdu); spdk_iscsi_task_set_pdu(&task, pdu1);
task.parent = NULL; task.parent = NULL;
task.scsi.iovs = &task.scsi.iov; task.scsi.iovs = &task.scsi.iov;
@ -423,7 +423,7 @@ underflow_for_request_sense_test(void)
task.scsi.status = SPDK_SCSI_STATUS_GOOD; task.scsi.status = SPDK_SCSI_STATUS_GOOD;
spdk_iscsi_task_response(&conn, &task); spdk_iscsi_task_response(&conn, &task);
spdk_put_pdu(pdu); spdk_put_pdu(pdu1);
/* /*
* In this case, a SCSI Data-In PDU and a SCSI Response PDU are returned. * In this case, a SCSI Data-In PDU and a SCSI Response PDU are returned.
@ -435,12 +435,12 @@ underflow_for_request_sense_test(void)
*/ */
to_be32(&residual_count, 494); to_be32(&residual_count, 494);
pdu = TAILQ_FIRST(&g_write_pdu_list); pdu1 = TAILQ_FIRST(&g_write_pdu_list);
SPDK_CU_ASSERT_FATAL(pdu != NULL); SPDK_CU_ASSERT_FATAL(pdu1 != NULL);
CU_ASSERT(pdu->bhs.opcode == ISCSI_OP_SCSI_DATAIN); CU_ASSERT(pdu1->bhs.opcode == ISCSI_OP_SCSI_DATAIN);
datah = (struct iscsi_bhs_data_in *)&pdu->bhs; datah = (struct iscsi_bhs_data_in *)&pdu1->bhs;
CU_ASSERT(datah->flags == ISCSI_FLAG_FINAL); CU_ASSERT(datah->flags == ISCSI_FLAG_FINAL);
@ -448,15 +448,17 @@ underflow_for_request_sense_test(void)
CU_ASSERT(data_segment_len == 18); CU_ASSERT(data_segment_len == 18);
CU_ASSERT(datah->res_cnt == 0); CU_ASSERT(datah->res_cnt == 0);
TAILQ_REMOVE(&g_write_pdu_list, pdu, tailq); TAILQ_REMOVE(&g_write_pdu_list, pdu1, tailq);
spdk_put_pdu(pdu); spdk_put_pdu(pdu1);
pdu = TAILQ_FIRST(&g_write_pdu_list); pdu2 = TAILQ_FIRST(&g_write_pdu_list);
SPDK_CU_ASSERT_FATAL(pdu != NULL); /* inform scan-build (clang 6) that these pointers are not the same */
SPDK_CU_ASSERT_FATAL(pdu1 != pdu2);
SPDK_CU_ASSERT_FATAL(pdu2 != NULL);
CU_ASSERT(pdu->bhs.opcode == ISCSI_OP_SCSI_RSP); CU_ASSERT(pdu2->bhs.opcode == ISCSI_OP_SCSI_RSP);
resph = (struct iscsi_bhs_scsi_resp *)&pdu->bhs; resph = (struct iscsi_bhs_scsi_resp *)&pdu2->bhs;
CU_ASSERT(resph->flags == (ISCSI_SCSI_UNDERFLOW | 0x80)); CU_ASSERT(resph->flags == (ISCSI_SCSI_UNDERFLOW | 0x80));
@ -464,8 +466,8 @@ underflow_for_request_sense_test(void)
CU_ASSERT(data_segment_len == task.scsi.sense_data_len + 2); CU_ASSERT(data_segment_len == task.scsi.sense_data_len + 2);
CU_ASSERT(resph->res_cnt == residual_count); CU_ASSERT(resph->res_cnt == residual_count);
TAILQ_REMOVE(&g_write_pdu_list, pdu, tailq); TAILQ_REMOVE(&g_write_pdu_list, pdu2, tailq);
spdk_put_pdu(pdu); spdk_put_pdu(pdu2);
CU_ASSERT(TAILQ_EMPTY(&g_write_pdu_list)); CU_ASSERT(TAILQ_EMPTY(&g_write_pdu_list));
} }