2009-07-25 21:45:57

by Roel Kluin

Subject: [PATCH] ipw2x00: Write outside array bounds

channel_index loops up to IPW_SCAN_CHANNELS, but is used after being
incremented. This might be able to access 1 past the end of the array

Signed-off-by: Roel Kluin <[email protected]>
---
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 44c29b3..d1c9d6d 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -6249,7 +6249,10 @@ static void ipw_add_scan_channels(struct ipw_priv *priv,

channels[channel - 1] = 1;
priv->speed_scan_pos++;
- channel_index++;
+
+ if (++channel_index >= IPW_SCAN_CHANNELS)
+ break;
+
scan->channels_list[channel_index] = channel;
index =
ieee80211_channel_to_index(priv->ieee, channel);

2009-07-27 02:10:21

by Zhu Yi

Subject: Re: [PATCH] ipw2x00: Write outside array bounds

On Sun, 2009-07-26 at 05:48 +0800, Roel Kluin wrote:
> channel_index loops up to IPW_SCAN_CHANNELS, but is used after being
> incremented. This might be able to access 1 past the end of the array
>
> Signed-off-by: Roel Kluin <[email protected]>

Thanks. Do you think below patch is better?

Thanks,
-yi

diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 2dc1cdb..07f171c 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -6226,7 +6226,7 @@ static void ipw_add_scan_channels(struct ipw_priv *priv,
};

u8 channel;
- while (channel_index < IPW_SCAN_CHANNELS) {
+ while (channel_index < IPW_SCAN_CHANNELS - 1) {
channel =
priv->speed_scan[priv->speed_scan_pos];
if (channel == 0) {


> ---
> diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
> index 44c29b3..d1c9d6d 100644
> --- a/drivers/net/wireless/ipw2x00/ipw2200.c
> +++ b/drivers/net/wireless/ipw2x00/ipw2200.c
> @@ -6249,7 +6249,10 @@ static void ipw_add_scan_channels(struct ipw_priv *priv,
>
> channels[channel - 1] = 1;
> priv->speed_scan_pos++;
> - channel_index++;
> +
> + if (++channel_index >= IPW_SCAN_CHANNELS)
> + break;
> +
> scan->channels_list[channel_index] = channel;
> index =
> ieee80211_channel_to_index(priv->ieee, channel);

2009-08-04 00:35:38

by Zhu Yi

Subject: Re: [PATCH] ipw2x00: Write outside array bounds

On Tue, 2009-08-04 at 03:51 +0800, John W. Linville wrote:
> On Mon, Jul 27, 2009 at 10:10:20AM +0800, Zhu Yi wrote:
> > On Sun, 2009-07-26 at 05:48 +0800, Roel Kluin wrote:
> > > channel_index loops up to IPW_SCAN_CHANNELS, but is used after being
> > > incremented. This might be able to access 1 past the end of the array
> > >
> > > Signed-off-by: Roel Kluin <[email protected]>
> >
> > Thanks. Do you think below patch is better?
>
> Didn't see an answer here...which patch do we want?

Please apply mine.

Thanks,
-yi

2009-08-03 20:01:06

by John W. Linville

Subject: Re: [PATCH] ipw2x00: Write outside array bounds

On Mon, Jul 27, 2009 at 10:10:20AM +0800, Zhu Yi wrote:
> On Sun, 2009-07-26 at 05:48 +0800, Roel Kluin wrote:
> > channel_index loops up to IPW_SCAN_CHANNELS, but is used after being
> > incremented. This might be able to access 1 past the end of the array
> >
> > Signed-off-by: Roel Kluin <[email protected]>
>
> Thanks. Do you think below patch is better?

Didn't see an answer here...which patch do we want?

John
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.
?Viva Honduras Libre!