linux-kernel - Re: [PATCH] iwlwifi: out-of-bounds access in iwl_init_sband

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]

Date:	Fri, 14 Aug 2015 04:31:55 +0000
From:	"Grumbach, Emmanuel" <emmanuel.grumbach@...el.com>
To:	Adrien Schildknecht <adrien+dev@...ischi.me>,
	"Berg, Johannes" <johannes.berg@...el.com>
CC:	"ilw@...ux.intel.com" <ilw@...ux.intel.com>,
	"kvalo@...eaurora.org" <kvalo@...eaurora.org>,
	"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>
Subject: Re: [PATCH] iwlwifi: out-of-bounds access in iwl_init_sband_channels

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@...ischi.me>
> ---
>  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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/