Re: [PATCH] watchdog: riowd: Mark expected switch fall-through

Kees Cook
2019-07-30T16:59:15Z

On Mon, Jul 29, 2019 at 08:46:50PM -0500, Gustavo A. R. Silva wrote:
> Mark switch cases where we are expecting to fall through.
>
> This patch fixes the following warnings (Building: sparc64):
>
> drivers/watchdog/riowd.c: In function ‘riowd_ioctl’:
> drivers/watchdog/riowd.c:136:3: warning: this statement may fall through [-Wimplicit-fallthrough=]
> riowd_writereg(p, riowd_timeout, WDTO_INDEX);
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/watchdog/riowd.c:139:2: note: here
> case WDIOC_GETTIMEOUT:
> ^~~~
>
> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>

Reviewed-by: Kees Cook <keescook@chromium.org>

-Kees

> ---
> drivers/watchdog/riowd.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/watchdog/riowd.c b/drivers/watchdog/riowd.c
> index 41a2a11535a6..b35f7be20c00 100644
> --- a/drivers/watchdog/riowd.c
> +++ b/drivers/watchdog/riowd.c
> @@ -134,7 +134,7 @@ static long riowd_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
> return -EINVAL;
> riowd_timeout = (new_margin + 59) / 60;
> riowd_writereg(p, riowd_timeout, WDTO_INDEX);
> - /* Fall */
> + /* Fall through */
>
> case WDIOC_GETTIMEOUT:
> return put_user(riowd_timeout * 60, (int __user *)argp);
> --
> 2.22.0
>

--
Kees Cook