linux-kernel - Re: [PATCH v2 3/5] drivers: usb: core: devio.c: Braces around if-elseif-else

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] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 16 Oct 2013 13:40:13 -0700
From:	Greg KH <gregkh@...uxfoundation.org>
To:	Matthias Beyer <mail@...ermatthias.de>
Cc:	linux-usb@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2 3/5] drivers: usb: core: devio.c: Braces around
 if-elseif-else

On Mon, Oct 14, 2013 at 09:46:38PM +0200, Matthias Beyer wrote:
> This patch applies the rules for braces to the if-elseif-else statement
> in proc_ioctl().
> 
> As the kernel styleguide says: If there is at least one multiline block
> in a if-else branching, we should add braces around all blocks. This
> includes braces around the switch-statement on the else branch, which
> needs a reindent after adding the braces.
> 
> Signed-off-by: Matthias Beyer <mail@...ermatthias.de>
> ---
>  drivers/usb/core/devio.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
> index d15aa51..dd8701b 100644
> --- a/drivers/usb/core/devio.c
> +++ b/drivers/usb/core/devio.c
> @@ -1222,7 +1222,7 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,
>  		return -ENOENT;
>  
>  	u = 0;
> -	switch(uurb->type) {
> +	switch (uurb->type) {
>  	case USBDEVFS_URB_TYPE_CONTROL:
>  		if (!usb_endpoint_xfer_control(&ep->desc))
>  			return -EINVAL;
> @@ -1838,11 +1838,12 @@ static int proc_ioctl(struct dev_state *ps, struct usbdevfs_ioctl *ctl)
>  		return -ENODEV;
>  	}
>  
> -	if (ps->dev->state != USB_STATE_CONFIGURED)
> +	if (ps->dev->state != USB_STATE_CONFIGURED) {
>  		retval = -EHOSTUNREACH;
> -	else if (!(intf = usb_ifnum_to_if(ps->dev, ctl->ifno)))
> +	} else if (!(intf = usb_ifnum_to_if(ps->dev, ctl->ifno))) {
>  		retval = -EINVAL;
> -	else switch (ctl->ioctl_code) {
> +	} else {
> +	switch (ctl->ioctl_code) {
>  
>  	/* disconnect kernel driver from interface */
>  	case USBDEVFS_DISCONNECT:
> @@ -1874,6 +1875,7 @@ static int proc_ioctl(struct dev_state *ps, struct usbdevfs_ioctl *ctl)
>  				retval = -ENOTTY;
>  		}
>  	}
> +	}

Two braces in line like that should scream at you that something is
wrong with the indentation here.

I'd leave it alone for the switch statement, as it's not needed.

Actually this whole thing should be fine, it's correct, right?

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/