Commit fcd8b045 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: ufs: core: Make ufshcd_uic_cmd_compl() easier to analyze 



In ufshcd_uic_cmd_compl(), there is code that dereferences 'cmd' with
and without checking the 'cmd' pointer. This confuses static source code
analyzers like Coverity and sparse. Since none of the code in
ufshcd_uic_cmd_compl() can do anything useful if 'cmd' is NULL, move the
'cmd' test near the start of this function.

Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20240912223019.3510966-4-bvanassche@acm.org


Reviewed-by: default avatarPeter Wang <peter.wang@mediatek.com>
Reviewed-by: default avatarBao D. Nguyen <quic_nguyenb@quicinc.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent e31931d6

drivers/ufs/core/ufshcd.c

+7 −1
Original line number Diff line number Diff line
@@ -5481,10 +5481,13 @@ static irqreturn_t ufshcd_uic_cmd_compl(struct ufs_hba *hba, u32 intr_status) 


	spin_lock(hba->host->host_lock);

	cmd = hba->active_uic_cmd;

	if (WARN_ON_ONCE(!cmd))

		goto unlock;



	if (ufshcd_is_auto_hibern8_error(hba, intr_status))

		hba->errors |= (UFSHCD_UIC_HIBERN8_MASK & intr_status);



	if (intr_status & UIC_COMMAND_COMPL && cmd) {

	if (intr_status & UIC_COMMAND_COMPL) {

		cmd->argument2 |= ufshcd_get_uic_cmd_result(hba);

		cmd->argument3 = ufshcd_get_dme_attr_val(hba);

		if (!hba->uic_async_done)
@@ -5501,7 +5504,10 @@ static irqreturn_t ufshcd_uic_cmd_compl(struct ufs_hba *hba, u32 intr_status) 


	if (retval == IRQ_HANDLED)

		ufshcd_add_uic_command_trace(hba, cmd, UFS_CMD_COMP);



unlock:

	spin_unlock(hba->host->host_lock);



	return retval;

}