[PATCH] scsi: wd33c93: Don't use stale scsi_pointer value

[PATCH] scsi: wd33c93: Don't use stale scsi_pointer value

[Finn Thain]

From: Daniel Palmer <daniel@0x0f.com>

A regression was introduced with commit dbb2da557a6a ("scsi: wd33c93: Move
the SCSI pointer to private command data") which results in an oops in
wd33c93_intr(). That commit added the scsi_pointer variable and
initialized it from hostdata->connected. However, during selection,
hostdata->connected is not yet valid. Fix this by getting the current
scsi_pointer from hostdata->selecting.

Cc: Daniel Palmer <daniel@0x0f.com>
Cc: Michael Schmitz <schmitzmic@gmail.com>
Cc: stable@kernel.org
Fixes: dbb2da557a6a ("scsi: wd33c93: Move the SCSI pointer to private command data")
Signed-off-by: Daniel Palmer <daniel@0x0f.com>
Co-developed-by: Finn Thain <fthain@linux-m68k.org>
Signed-off-by: Finn Thain <fthain@linux-m68k.org>
---
 drivers/scsi/wd33c93.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c
index a44b60c9004a..dd1fef9226f2 100644
--- a/drivers/scsi/wd33c93.c
+++ b/drivers/scsi/wd33c93.c
@@ -831,7 +831,7 @@ wd33c93_intr(struct Scsi_Host *instance)
 		/* construct an IDENTIFY message with correct disconnect bit */
 
 		hostdata->outgoing_msg[0] = IDENTIFY(0, cmd->device->lun);
-		if (scsi_pointer->phase)
+		if (WD33C93_scsi_pointer(cmd)->phase)
 			hostdata->outgoing_msg[0] |= 0x40;
 
 		if (hostdata->sync_stat[cmd->device->id] == SS_FIRST) {
-- 
2.39.5

Re: [PATCH] scsi: wd33c93: Don't use stale scsi_pointer value

[Michael Schmitz]

Hi Finn,

looks good to me, so:

Reviewed-by: Michael Schmitz <schmitzmic@gmail.com>

Cheers,

	Michael


Am 03.10.2024 um 16:29 schrieb Finn Thain:
> From: Daniel Palmer <daniel@0x0f.com>
>
> A regression was introduced with commit dbb2da557a6a ("scsi: wd33c93: Move
> the SCSI pointer to private command data") which results in an oops in
> wd33c93_intr(). That commit added the scsi_pointer variable and
> initialized it from hostdata->connected. However, during selection,
> hostdata->connected is not yet valid. Fix this by getting the current
> scsi_pointer from hostdata->selecting.
>
> Cc: Daniel Palmer <daniel@0x0f.com>
> Cc: Michael Schmitz <schmitzmic@gmail.com>
> Cc: stable@kernel.org
> Fixes: dbb2da557a6a ("scsi: wd33c93: Move the SCSI pointer to private command data")
> Signed-off-by: Daniel Palmer <daniel@0x0f.com>
> Co-developed-by: Finn Thain <fthain@linux-m68k.org>
> Signed-off-by: Finn Thain <fthain@linux-m68k.org>
> ---
>  drivers/scsi/wd33c93.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c
> index a44b60c9004a..dd1fef9226f2 100644
> --- a/drivers/scsi/wd33c93.c
> +++ b/drivers/scsi/wd33c93.c
> @@ -831,7 +831,7 @@ wd33c93_intr(struct Scsi_Host *instance)
>  		/* construct an IDENTIFY message with correct disconnect bit */
>
>  		hostdata->outgoing_msg[0] = IDENTIFY(0, cmd->device->lun);
> -		if (scsi_pointer->phase)
> +		if (WD33C93_scsi_pointer(cmd)->phase)
>  			hostdata->outgoing_msg[0] |= 0x40;
>
>  		if (hostdata->sync_stat[cmd->device->id] == SS_FIRST) {
>

Re: [PATCH] scsi: wd33c93: Don't use stale scsi_pointer value

[Bart Van Assche]

On 10/2/24 8:29 PM, Finn Thain wrote:
> diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c
> index a44b60c9004a..dd1fef9226f2 100644
> --- a/drivers/scsi/wd33c93.c
> +++ b/drivers/scsi/wd33c93.c
> @@ -831,7 +831,7 @@ wd33c93_intr(struct Scsi_Host *instance)
>   		/* construct an IDENTIFY message with correct disconnect bit */
>   
>   		hostdata->outgoing_msg[0] = IDENTIFY(0, cmd->device->lun);
> -		if (scsi_pointer->phase)
> +		if (WD33C93_scsi_pointer(cmd)->phase)
>   			hostdata->outgoing_msg[0] |= 0x40;
>   
>   		if (hostdata->sync_stat[cmd->device->id] == SS_FIRST) {

Reviewed-by: Bart Van Assche <bvanassche@acm.org>

Re: [PATCH] scsi: wd33c93: Don't use stale scsi_pointer value

[Martin K. Petersen]

On Thu, 03 Oct 2024 13:29:47 +1000, Finn Thain wrote:

> A regression was introduced with commit dbb2da557a6a ("scsi: wd33c93: Move
> the SCSI pointer to private command data") which results in an oops in
> wd33c93_intr(). That commit added the scsi_pointer variable and
> initialized it from hostdata->connected. However, during selection,
> hostdata->connected is not yet valid. Fix this by getting the current
> scsi_pointer from hostdata->selecting.
> 
> [...]

Applied to 6.12/scsi-fixes, thanks!

[1/1] scsi: wd33c93: Don't use stale scsi_pointer value
      https://git.kernel.org/mkp/scsi/c/9023ed8d91eb

-- 
Martin K. Petersen	Oracle Linux Engineering