Re: [PATCH] iwlwifi: out-of-bounds access in iwl_init_sband_channels

[Grumbach, Emmanuel]

Hi,

On 08/14/2015 03:36 AM, Adrien Schildknecht wrote:
> Both loops of this function compare data from the 'chan' array and then
> check if the index is valid.
> 
> The 2 conditions should be inverted to avoid an out-of-bounds access.
> 

Was that found by a static analyzer or any other automated tool, or was
that the result of your very careful review?

> Signed-off-by: Adrien Schildknecht <adrien+dev@xxxxxxxxxxx>
> ---
>  drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
> index 21302b6..acc3d18 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
> @@ -713,12 +713,12 @@ int iwl_init_sband_channels(struct iwl_nvm_data *data,
>  	struct ieee80211_channel *chan = &data->channels[0];
>  	int n = 0, idx = 0;
>  
> -	while (chan->band != band && idx < n_channels)
> +	while (idx < n_channels && chan->band != band)
>  		chan = &data->channels[++idx];
>  
>  	sband->channels = &data->channels[idx];
>  
> -	while (chan->band == band && idx < n_channels) {
> +	while (idx < n_channels && chan->band == band) {
>  		chan = &data->channels[++idx];
>  		n++;
>  	}
> 

Looks fine - I'll pick it up.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/