linux-kernel - Re: [PATCH] watchdog: sbc60xxwdt: Mark expected switch fall-through

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20190226205946.GA21115@roeck-us.net>
Date:   Tue, 26 Feb 2019 12:59:46 -0800
From:   Guenter Roeck <linux@...ck-us.net>
To:     "Gustavo A. R. Silva" <gustavo@...eddedor.com>
Cc:     Wim Van Sebroeck <wim@...ux-watchdog.org>,
        linux-watchdog@...r.kernel.org, linux-kernel@...r.kernel.org,
        Kees Cook <keescook@...omium.org>
Subject: Re: [PATCH] watchdog: sbc60xxwdt: Mark expected switch fall-through

On Tue, Feb 26, 2019 at 11:58:35AM -0600, Gustavo A. R. Silva wrote:
> In preparation to enabling -Wimplicit-fallthrough, mark switch
> cases where we are expecting to fall through.
> 
> This patch fixes the following warning:
> 
> drivers/watchdog/sbc60xxwdt.c: In function ‘fop_ioctl’:
> drivers/watchdog/sbc60xxwdt.c:272:3: warning: this statement may fall through [-Wimplicit-fallthrough=]
>    wdt_keepalive();
>    ^~~~~~~~~~~~~~~
> drivers/watchdog/sbc60xxwdt.c:275:2: note: here
>   case WDIOC_GETTIMEOUT:
>   ^~~~
> 
> Notice that, in this particular case, the code comment is modified
> in accordance with what GCC is expecting to find.
> 
> This patch is part of the ongoing efforts to enable
> -Wimplicit-fallthrough.
> 
> Signed-off-by: Gustavo A. R. Silva <gustavo@...eddedor.com>

Reviewed-by: Guenter Roeck <linux@...ck-us.net>

> ---
>  drivers/watchdog/sbc60xxwdt.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/watchdog/sbc60xxwdt.c b/drivers/watchdog/sbc60xxwdt.c
> index 87333a41f753..72d15fd1f183 100644
> --- a/drivers/watchdog/sbc60xxwdt.c
> +++ b/drivers/watchdog/sbc60xxwdt.c
> @@ -270,8 +270,8 @@ static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
>  
>  		timeout = new_timeout;
>  		wdt_keepalive();
> -		/* Fall through */
>  	}
> +		/* Fall through */
>  	case WDIOC_GETTIMEOUT:
>  		return put_user(timeout, p);
>  	default:
> -- 
> 2.20.1
>