From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2109A1A072D; Tue, 27 Aug 2024 14:49:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724770195; cv=none; b=Eoh6ydkkoO2qEcBPhTI0OAPr5uHngDIjlkkYw2ZUh3/28TjAeqJQCycFt+1pMgCBmYTJokx50R3+/y4hdkn73J7UNM/94mBzMVi4bIFuEKlpO1Yri6C4G26QMBRP691eOlShd/FpDvgzm8ABVqgVRyP0NUr4xaA3vrq/MDy9aAc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724770195; c=relaxed/simple; bh=FISunt2bYraKNIX1iczucc51zlV8cBiqxgNCm9zPvRM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U/5M4QNkyY1Je5XAsuyWLbkNbSZhIE2uD7lbInNRbyITJgJ6IGN6LaAeqf4g18iUfNlNBuT3CW7gHxLJt519xFFvrkG/bApTL7avCJWJUBsb3bxVyPJUw9mJZx0Lyjdi5AmtA2brXjxxm4TzDgqBS3NpbMcNkFTnblkj+jnkNbY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=a6VoQl12; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="a6VoQl12" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 251DEC4DDEA; Tue, 27 Aug 2024 14:49:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1724770194; bh=FISunt2bYraKNIX1iczucc51zlV8cBiqxgNCm9zPvRM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a6VoQl12kOeG8SDemy0pH1bH31IoowhI5/4idcexapRjyI+8oaOQ3WsQfJ3Fq41/q akwvzSMZcipo+5gQfZ4ZQE3yHrHhxhRc4I4OyjHqKmSyoZwM+7hkqFJ+2vUwjJQRpX uakxfskZzcp/bvgzuiXjVxoYlbp9FQskpLf9omh4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mike Christie , Christoph Hellwig , John Garry , Martin Wilck , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 6.6 124/341] scsi: spi: Fix sshdr use Date: Tue, 27 Aug 2024 16:35:55 +0200 Message-ID: <20240827143848.134926351@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240827143843.399359062@linuxfoundation.org> References: <20240827143843.399359062@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mike Christie [ Upstream commit 0b149cee836aa53989ea089af1cb9d90d7c6ac9e ] If scsi_execute_cmd returns < 0, it doesn't initialize the sshdr, so we shouldn't access the sshdr. If it returns 0, then the cmd executed successfully, so there is no need to check the sshdr. This has us access the sshdr when we get a return value > 0. Signed-off-by: Mike Christie Link: https://lore.kernel.org/r/20231004210013.5601-7-michael.christie@oracle.com Reviewed-by: Christoph Hellwig Reviewed-by: John Garry Reviewed-by: Martin Wilck Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/scsi_transport_spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c index 2442d4d2e3f38..f668c1c0a98f2 100644 --- a/drivers/scsi/scsi_transport_spi.c +++ b/drivers/scsi/scsi_transport_spi.c @@ -676,10 +676,10 @@ spi_dv_device_echo_buffer(struct scsi_device *sdev, u8 *buffer, for (r = 0; r < retries; r++) { result = spi_execute(sdev, spi_write_buffer, REQ_OP_DRV_OUT, buffer, len, &sshdr); - if(result || !scsi_device_online(sdev)) { + if (result || !scsi_device_online(sdev)) { scsi_device_set_state(sdev, SDEV_QUIESCE); - if (scsi_sense_valid(&sshdr) + if (result > 0 && scsi_sense_valid(&sshdr) && sshdr.sense_key == ILLEGAL_REQUEST /* INVALID FIELD IN CDB */ && sshdr.asc == 0x24 && sshdr.ascq == 0x00) -- 2.43.0