linux-kernel - Re: [PATCH v3 4/6] Staging: rtl8192e: Added braces around 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:   Sat, 2 Jul 2022 08:10:24 +0200
From:   Philipp Hortmann <philipp.g.hortmann@...il.com>
To:     Felix Schlepper <f3sch.git@...look.com>, gregkh@...uxfoundation.org
Cc:     linux-staging@...ts.linux.dev, linux-kernel@...r.kernel.org,
        wjsota@...il.com
Subject: Re: [PATCH v3 4/6] Staging: rtl8192e: Added braces around else

On 7/1/22 11:24, Felix Schlepper wrote:
> This addresses two issues raised by checkpatch.pl:
> 
>       $ ./scripts/checkpatch.pl --terse -f drivers/staging/rtl8192e/rtllib_wx.c
>       CHECK: braces {} should be used on all arms of this statement
>       CHECK: Unbalanced braces around else statement
> 
> The coding style rule with not using unnecessary braces around if/else
> does not apply if only one branch is a single statement.
> 
> Signed-off-by: Felix Schlepper <f3sch.git@...look.com>
> ---
>   drivers/staging/rtl8192e/rtllib_wx.c | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c
> index db076e819993..b949e7234150 100644
> --- a/drivers/staging/rtl8192e/rtllib_wx.c
> +++ b/drivers/staging/rtl8192e/rtllib_wx.c
> @@ -304,8 +304,9 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,
>   			netdev_dbg(ieee->dev,
>   				   "Disabling encryption on key %d.\n", key);
>   			lib80211_crypt_delayed_deinit(&ieee->crypt_info, crypt);
> -		} else
> +		} else {
>   			netdev_dbg(ieee->dev, "Disabling encryption.\n");
> +		}
>   
>   		/* Check all the keys to see if any are still configured,
>   		 * and if no key index was provided, de-init them all
> @@ -724,8 +725,9 @@ int rtllib_wx_set_auth(struct rtllib_device *ieee,
>   		} else if (data->value & IW_AUTH_ALG_LEAP) {
>   			ieee->open_wep = 1;
>   			ieee->auth_mode = 2;
> -		} else
> +		} else {
>   			return -EINVAL;
> +		}
>   		break;
>   
>   	case IW_AUTH_WPA_ENABLED:

Tested-by: Philipp Hortmann <philipp.g.hortmann@...il.com>