All of lore.kernel.org
 help / color / mirror / Atom feed
From: Felix Fietkau <nbd@openwrt.org>
To: ath9k-devel@lists.ath9k.org
Subject: [ath9k-devel] [PATCH] ath9k: Prevent divide by zero kernel crash.
Date: Thu, 17 Apr 2014 09:47:26 +0200	[thread overview]
Message-ID: <534F870E.80209@openwrt.org> (raw)
In-Reply-To: <1397695240-13710-1-git-send-email-greearb@candelatech.com>

On 2014-04-17 02:40, greearb at candelatech.com wrote:
> From: Ben Greear <greearb@candelatech.com>
> 
> Make sure we cannot ever assign beacon interval to zero.
> 
> Signed-off-by: Ben Greear <greearb@candelatech.com>
> ---
>  drivers/net/wireless/ath/ath9k/beacon.c | 4 ++++
>  drivers/net/wireless/ath/ath9k/recv.c   | 3 ++-
>  2 files changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c
> index 2e8bba0..5391f01 100644
> --- a/drivers/net/wireless/ath/ath9k/beacon.c
> +++ b/drivers/net/wireless/ath/ath9k/beacon.c
> @@ -443,6 +443,8 @@ static u32 ath9k_mod_tsf64_tu(u64 tsf, u32 div_tu)
>  {
>  	u32 tsf_mod, tsf_hi, tsf_lo, mod_hi, mod_lo;
>  
> +	if (WARN_ON_ONCE(div_tu == 0))
> +		div_tu = 100;
>  	tsf_mod = tsf & (BIT(10) - 1);
>  	tsf_hi = tsf >> 32;
>  	tsf_lo = ((u32) tsf) >> 10;
Why add this warning here if you already have the additions below? We
don't need multiple layers of defensive checks for the same thing.

> @@ -667,6 +669,8 @@ static void ath9k_cache_beacon_config(struct ath_softc *sc,
>  		"Caching beacon data for BSS: %pM\n", bss_conf->bssid);
>  
>  	cur_conf->beacon_interval = bss_conf->beacon_int;
> +	if (WARN_ON_ONCE(cur_conf->beacon_interval == 0))
> +		cur_conf->beacon_interval = 100;
>  	cur_conf->dtim_period = bss_conf->dtim_period;
>  	cur_conf->listen_interval = 1;
>  	cur_conf->dtim_count = 1;
> diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
> index b97217d..79c20c7 100644
> --- a/drivers/net/wireless/ath/ath9k/recv.c
> +++ b/drivers/net/wireless/ath/ath9k/recv.c
> @@ -538,7 +538,8 @@ static void ath_rx_ps_beacon(struct ath_softc *sc, struct sk_buff *skb)
>  		sc->ps_flags &= ~PS_BEACON_SYNC;
>  		ath_dbg(common, PS,
>  			"Reconfigure beacon timers based on synchronized timestamp\n");
> -		ath9k_set_beacon(sc);
> +		if (!(WARN_ON_ONCE(sc->cur_beacon_conf.beacon_interval == 0)))
> +			ath9k_set_beacon(sc);
>  	}
>  
>  	if (ath_beacon_dtim_pending_cab(skb)) {
> 

WARNING: multiple messages have this Message-ID (diff)
From: Felix Fietkau <nbd@openwrt.org>
To: greearb@candelatech.com, ath9k-devel@venema.h4ckr.net
Cc: linux-wireless@vger.kernel.org
Subject: Re: [PATCH] ath9k:  Prevent divide by zero kernel crash.
Date: Thu, 17 Apr 2014 09:47:26 +0200	[thread overview]
Message-ID: <534F870E.80209@openwrt.org> (raw)
In-Reply-To: <1397695240-13710-1-git-send-email-greearb@candelatech.com>

On 2014-04-17 02:40, greearb@candelatech.com wrote:
> From: Ben Greear <greearb@candelatech.com>
> 
> Make sure we cannot ever assign beacon interval to zero.
> 
> Signed-off-by: Ben Greear <greearb@candelatech.com>
> ---
>  drivers/net/wireless/ath/ath9k/beacon.c | 4 ++++
>  drivers/net/wireless/ath/ath9k/recv.c   | 3 ++-
>  2 files changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c
> index 2e8bba0..5391f01 100644
> --- a/drivers/net/wireless/ath/ath9k/beacon.c
> +++ b/drivers/net/wireless/ath/ath9k/beacon.c
> @@ -443,6 +443,8 @@ static u32 ath9k_mod_tsf64_tu(u64 tsf, u32 div_tu)
>  {
>  	u32 tsf_mod, tsf_hi, tsf_lo, mod_hi, mod_lo;
>  
> +	if (WARN_ON_ONCE(div_tu == 0))
> +		div_tu = 100;
>  	tsf_mod = tsf & (BIT(10) - 1);
>  	tsf_hi = tsf >> 32;
>  	tsf_lo = ((u32) tsf) >> 10;
Why add this warning here if you already have the additions below? We
don't need multiple layers of defensive checks for the same thing.

> @@ -667,6 +669,8 @@ static void ath9k_cache_beacon_config(struct ath_softc *sc,
>  		"Caching beacon data for BSS: %pM\n", bss_conf->bssid);
>  
>  	cur_conf->beacon_interval = bss_conf->beacon_int;
> +	if (WARN_ON_ONCE(cur_conf->beacon_interval == 0))
> +		cur_conf->beacon_interval = 100;
>  	cur_conf->dtim_period = bss_conf->dtim_period;
>  	cur_conf->listen_interval = 1;
>  	cur_conf->dtim_count = 1;
> diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
> index b97217d..79c20c7 100644
> --- a/drivers/net/wireless/ath/ath9k/recv.c
> +++ b/drivers/net/wireless/ath/ath9k/recv.c
> @@ -538,7 +538,8 @@ static void ath_rx_ps_beacon(struct ath_softc *sc, struct sk_buff *skb)
>  		sc->ps_flags &= ~PS_BEACON_SYNC;
>  		ath_dbg(common, PS,
>  			"Reconfigure beacon timers based on synchronized timestamp\n");
> -		ath9k_set_beacon(sc);
> +		if (!(WARN_ON_ONCE(sc->cur_beacon_conf.beacon_interval == 0)))
> +			ath9k_set_beacon(sc);
>  	}
>  
>  	if (ath_beacon_dtim_pending_cab(skb)) {
> 


  reply	other threads:[~2014-04-17  7:47 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-17  0:40 [ath9k-devel] [PATCH] ath9k: Prevent divide by zero kernel crash greearb at candelatech.com
2014-04-17  0:40 ` greearb
2014-04-17  7:47 ` Felix Fietkau [this message]
2014-04-17  7:47   ` Felix Fietkau
2014-04-22 17:53   ` [ath9k-devel] " John W. Linville
2014-04-22 17:53     ` John W. Linville
2014-04-22 18:03     ` [ath9k-devel] " Ben Greear
2014-04-22 18:03       ` Ben Greear
2014-04-30 18:47   ` [ath9k-devel] " Ben Greear
2014-04-30 18:47     ` Ben Greear

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=534F870E.80209@openwrt.org \
    --to=nbd@openwrt.org \
    --cc=ath9k-devel@lists.ath9k.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.