linux-kernel - Re: [PATCH 2/3] staging: rtl8188eu: if/else replaced by min

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]

Message-ID: <CAHp75Vfxw6U9xg3R3H3=H+0Gv7aZzK3SXC6v+owZa8wE996oEw@mail.gmail.com>
Date:	Fri, 6 Nov 2015 23:42:50 +0200
From:	Andy Shevchenko <andy.shevchenko@...il.com>
To:	Ivan Safonov <insafonov@...il.com>
Cc:	devel@...verdev.osuosl.org,
	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	Larry Finger <Larry.Finger@...inger.net>,
	Vaishali Thakkar <vthakkar1994@...il.com>,
	Bryan Paul <bryan.paul@...oo.com>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 2/3] staging: rtl8188eu: if/else replaced by min_t

On Fri, Nov 6, 2015 at 5:18 PM, Ivan Safonov <insafonov@...il.com> wrote:
> Duplicated code removed.
>
> Signed-off-by: Ivan Safonov <insafonov@...il.com>
> ---
>  drivers/staging/rtl8188eu/core/rtw_cmd.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/staging/rtl8188eu/core/rtw_cmd.c b/drivers/staging/rtl8188eu/core/rtw_cmd.c
> index c0fff77..80c602e 100644
> --- a/drivers/staging/rtl8188eu/core/rtw_cmd.c
> +++ b/drivers/staging/rtl8188eu/core/rtw_cmd.c
> @@ -446,10 +446,7 @@ u8 rtw_joinbss_cmd(struct adapter  *padapter, struct wlan_network *pnetwork)
>
>         psecuritypriv->authenticator_ie[0] = (unsigned char)psecnetwork->IELength;
>
> -       if ((psecnetwork->IELength-12) < (256-1))
> -               memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->IEs[12], psecnetwork->IELength-12);
> -       else
> -               memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->IEs[12], (256-1));
> +       memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->IEs[12], min_t(int, psecnetwork->IELength - 12, 256 - 1));
>

Run checkpatch.pl.

256 looks like sizeof(…).

>         psecnetwork->IELength = 0;
>         /*  Added by Albert 2009/02/18 */
> --
> 2.4.10
>
> --
> 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/



-- 
With Best Regards,
Andy Shevchenko
--
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/