[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <477F20668A386D41ADCC57781B1F70430D142545EE@SC-VEXCH1.marvell.com>
Date: Mon, 28 Jan 2013 10:53:33 -0800
From: Bing Zhao <bzhao@...vell.com>
To: Cyril Roelandt <tipecaml@...il.com>,
"linville@...driver.com" <linville@...driver.com>
CC: "linux-wireless@...r.kernel.org" <linux-wireless@...r.kernel.org>,
"netdev@...r.kernel.org" <netdev@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"kernel-janitors@...r.kernel.org" <kernel-janitors@...r.kernel.org>
Subject: RE: [PATCH] mwifiex: avoid out of bounds access in
mwifiex_get_common_rates.
Hi Cyril,
Thanks for your patch.
> Check that the array indexes are in-bounds before accessing the rate2 and tmp
> arrays.
>
> Found with the following semantic patch:
>
> <smpl>
> @@
> identifier t;
> identifier idx;
> expression E;
> statement S;
> @@
> * for (... ; <+... t[idx] ...+> && idx < E ; ...)
> S
> </smpl>
>
> Signed-off-by: Cyril Roelandt <tipecaml@...il.com>
Acked-by: Bing Zhao <bzhao@...vell.com>
Thanks,
Bing
> ---
> drivers/net/wireless/mwifiex/join.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/mwifiex/join.c b/drivers/net/wireless/mwifiex/join.c
> index 893d809..f0a634d 100644
> --- a/drivers/net/wireless/mwifiex/join.c
> +++ b/drivers/net/wireless/mwifiex/join.c
> @@ -157,8 +157,8 @@ static int mwifiex_get_common_rates(struct mwifiex_private *priv, u8 *rate1,
>
> memset(rate1, 0, rate1_size);
>
> - for (i = 0; rate2[i] && i < rate2_size; i++) {
> - for (j = 0; tmp[j] && j < rate1_size; j++) {
> + for (i = 0; i < rate2_size && rate2[i]; i++) {
> + for (j = 0; j < rate1_size && tmp[j]; j++) {
> /* Check common rate, excluding the bit for
> basic rate */
> if ((rate2[i] & 0x7F) == (tmp[j] & 0x7F)) {
> --
> 1.7.10.4
--
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/
Powered by blists - more mailing lists