Commit 81d60e6f authored by Tsuyoshi Uchida's avatar Tsuyoshi Uchida Committed by Daniel Verkamp
Browse files

scsi: fix panic issue of spdk_scsi_dev_queue_task 

When task->lun is NULL, spdk_scsi_dev_queue_task panics. This patch
fixes it.
parent 987ba616

lib/scsi/dev.c

+4 −3
Original line number Diff line number Diff line
@@ -198,10 +198,11 @@ spdk_scsi_dev_queue_task(struct spdk_scsi_dev *dev, 
{

	assert(task != NULL);



	/* ready to enqueue, disk is valid for LUN access */

	spdk_scsi_lun_append_task(task->lun, task);

	if (spdk_scsi_lun_append_task(task->lun, task) == 0) {

		/* ready to execute, disk is valid for LUN access */

		spdk_scsi_lun_execute_tasks(task->lun);

	}

}



int

spdk_scsi_dev_add_port(struct spdk_scsi_dev *dev, uint64_t id, const char *name)

lib/scsi/lun.c

+3 −2
Original line number Diff line number Diff line
@@ -223,15 +223,16 @@ complete_task_with_no_lun(struct spdk_scsi_task *task) 
	spdk_scsi_lun_complete_task(NULL, task);

}



void

int

spdk_scsi_lun_append_task(struct spdk_scsi_lun *lun, struct spdk_scsi_task *task)

{

	if (lun == NULL) {

		complete_task_with_no_lun(task);

		return;

		return -1;

	}



	TAILQ_INSERT_TAIL(&lun->pending_tasks, task, scsi_link);

	return 0;

}



void

lib/scsi/scsi_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ typedef struct spdk_scsi_lun _spdk_scsi_lun; 
_spdk_scsi_lun *spdk_scsi_lun_construct(const char *name, struct spdk_bdev *bdev);



void spdk_scsi_lun_clear_all(struct spdk_scsi_lun *lun);

void spdk_scsi_lun_append_task(struct spdk_scsi_lun *lun, struct spdk_scsi_task *task);

int spdk_scsi_lun_append_task(struct spdk_scsi_lun *lun, struct spdk_scsi_task *task);

void spdk_scsi_lun_execute_tasks(struct spdk_scsi_lun *lun);

int spdk_scsi_lun_task_mgmt_execute(struct spdk_scsi_task *task);

void spdk_scsi_lun_complete_task(struct spdk_scsi_lun *lun, struct spdk_scsi_task *task);

test/lib/scsi/dev/dev_ut.c

+2 −1
Original line number Diff line number Diff line
@@ -107,9 +107,10 @@ spdk_scsi_lun_task_mgmt_execute(struct spdk_scsi_task *task) 
	return 0;

}



void

int

spdk_scsi_lun_append_task(struct spdk_scsi_lun *lun, struct spdk_scsi_task *task)

{

	return 0;

}



void