[PATCH] firewire: core: correct range of block for case of switch statement

[PATCH] firewire: core: correct range of block for case of switch statement

[Takashi Sakamoto]

A commit d8527cab6c31 ("firewire: cdev: implement new event to notify
response subaction with time stamp") adds an additional case,
FW_CDEV_EVENT_RESPONSE2, into switch statement in complete_transaction().
However, the range of block is beyond to the case label and reaches
neibour default label.

This commit corrects the range of block. Fortunately, it has few impacts
in practice since the local variable in the scope under the label is not
used in codes under default label.

Fixes: d8527cab6c31 ("firewire: cdev: implement new event to notify response subaction with time stamp")
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
---
 drivers/firewire/core-cdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
index 672a37fa8343..c211bb19c94e 100644
--- a/drivers/firewire/core-cdev.c
+++ b/drivers/firewire/core-cdev.c
@@ -589,11 +589,11 @@ static void complete_transaction(struct fw_card *card, int rcode, u32 request_ts
 		queue_event(client, &e->event, rsp, sizeof(*rsp) + rsp->length, NULL, 0);
 
 		break;
+	}
 	default:
 		WARN_ON(1);
 		break;
 	}
-	}
 
 	/* Drop the idr's reference */
 	client_put(client);
-- 
2.43.0

Re: [PATCH] firewire: core: correct range of block for case of switch statement

[Takashi Sakamoto]

On Sat, Aug 10, 2024 at 04:04:03PM +0900, Takashi Sakamoto wrote:
> A commit d8527cab6c31 ("firewire: cdev: implement new event to notify
> response subaction with time stamp") adds an additional case,
> FW_CDEV_EVENT_RESPONSE2, into switch statement in complete_transaction().
> However, the range of block is beyond to the case label and reaches
> neibour default label.
> 
> This commit corrects the range of block. Fortunately, it has few impacts
> in practice since the local variable in the scope under the label is not
> used in codes under default label.
> 
> Fixes: d8527cab6c31 ("firewire: cdev: implement new event to notify response subaction with time stamp")
> Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
> ---
>  drivers/firewire/core-cdev.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
> index 672a37fa8343..c211bb19c94e 100644
> --- a/drivers/firewire/core-cdev.c
> +++ b/drivers/firewire/core-cdev.c
> @@ -589,11 +589,11 @@ static void complete_transaction(struct fw_card *card, int rcode, u32 request_ts
>  		queue_event(client, &e->event, rsp, sizeof(*rsp) + rsp->length, NULL, 0);
>  
>  		break;
> +	}
>  	default:
>  		WARN_ON(1);
>  		break;
>  	}
> -	}
>  
>  	/* Drop the idr's reference */
>  	client_put(client);

Applied for-next branch.


Regards

Takashi Sakamoto