* [PATCH] mwifiex: avoid out of bounds access in mwifiex_get_common_rates.
@ 2013-01-27 22:42 Cyril Roelandt
2013-01-28 18:53 ` Bing Zhao
0 siblings, 1 reply; 2+ messages in thread
From: Cyril Roelandt @ 2013-01-27 22:42 UTC (permalink / raw)
To: bzhao, linville
Cc: linux-wireless, netdev, linux-kernel, kernel-janitors,
Cyril Roelandt
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@gmail.com>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* RE: [PATCH] mwifiex: avoid out of bounds access in mwifiex_get_common_rates.
2013-01-27 22:42 [PATCH] mwifiex: avoid out of bounds access in mwifiex_get_common_rates Cyril Roelandt
@ 2013-01-28 18:53 ` Bing Zhao
0 siblings, 0 replies; 2+ messages in thread
From: Bing Zhao @ 2013-01-28 18:53 UTC (permalink / raw)
To: Cyril Roelandt, linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
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@gmail.com>
Acked-by: Bing Zhao <bzhao@marvell.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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-01-28 18:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-27 22:42 [PATCH] mwifiex: avoid out of bounds access in mwifiex_get_common_rates Cyril Roelandt
2013-01-28 18:53 ` Bing Zhao
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox