linux-kernel - Re: [PATCH] staging: rtl8723bs: clean up identical code on an if statement

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: <560665f3-45cb-0d34-aac1-04f3fe6d4b59@redhat.com>
Date:   Fri, 14 Apr 2017 14:15:32 +0200
From:   Hans de Goede <hdegoede@...hat.com>
To:     Colin King <colin.king@...onical.com>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Larry Finger <Larry.Finger@...inger.net>,
        devel@...verdev.osuosl.org
Cc:     kernel-janitors@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] staging: rtl8723bs: clean up identical code on an if
 statement

Hi,

On 13-04-17 17:46, Colin King wrote:
> From: Colin Ian King <colin.king@...onical.com>
>
> The two different paths for an if statement are identical and hence
> we can just replace it with the single statement.
>
> Detected by CoverityScan, CID#1428443 ("Identical code for
> different branches")
>
> Signed-off-by: Colin Ian King <colin.king@...onical.com>

Patch looks good to me:

Reviewed-by: Hans de Goede <hdegoede@...hat.com>

Regards,

Hans




> ---
>  drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
> index 53755e5b97a6..9e355734f0c0 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
> @@ -1093,11 +1093,7 @@ void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue)
>  		rtw_init_bcmc_stainfo(adapter);
>  	}
>
> -	if (lock_scanned_queue) {
> -		find_network(adapter);
> -	} else {
> -		find_network(adapter);
> -	}
> +	find_network(adapter);
>
>  	if (lock_scanned_queue)
>  		adapter->securitypriv.key_mask = 0;
>