diff mbox series

[2/2] batman-adv: Accept only filled wifi station info

Message ID 20170609130255.8577-2-sven@narfation.org
State Superseded, archived
Delegated to: Simon Wunderlich
Headers show
Series [1/2] batman-adv: Use default throughput value on cfg80211 error | expand

Commit Message

Sven Eckelmann June 9, 2017, 1:02 p.m. UTC
The wifi driver can decide to not provide parts of the station info. For
example, the expected throughput of the station can be omitted when the
used rate control doesn't provide this kind of information.

The B.A.T.M.A.N. V implementation must therefore check the filled bitfield
before it tries to access the expected_throughput of the returned
station_info.

Reported-by: Alvaro Antelo <alvaro.antelo@gmail.com>
Fixes: 5c3245172c01 ("batman-adv: ELP - compute the metric based on the estimated throughput")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 compat-include/net/cfg80211.h | 2 ++
 net/batman-adv/bat_v_elp.c    | 2 ++
 2 files changed, 4 insertions(+)

Comments

Sven Eckelmann June 9, 2017, 2:06 p.m. UTC | #1
On Freitag, 9. Juni 2017 15:02:55 CEST Sven Eckelmann wrote:
[...]
>  #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)
> diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
> index 96e73337..16552568 100644
> --- a/net/batman-adv/bat_v_elp.c
> +++ b/net/batman-adv/bat_v_elp.c
> @@ -111,6 +111,8 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh)
>  		}
>  		if (ret)
>  			goto default_throughput;
> +		if (!(sinfo.filled & STATION_INFO_EXPECTED_THROUGHPUT))
> +			goto default_throughput;
>  
>  		return sinfo.expected_throughput / 100;
>  	}
> 

Looks like STATION_INFO_EXPECTED_THROUGHPUT was removed in 
319090bf6c75e3ad42a8c74973be5e78ae4f948f and 
BIT(NL80211_STA_INFO_EXPECTED_THROUGHPUT) must now be used. Of course, 
NL80211_STA_INFO_EXPECTED_THROUGHPUT doesn't have the value 28 :(

Kind regards,
	Sven
diff mbox series

Patch

diff --git a/compat-include/net/cfg80211.h b/compat-include/net/cfg80211.h
index 6e0eca3c..f65fa756 100644
--- a/compat-include/net/cfg80211.h
+++ b/compat-include/net/cfg80211.h
@@ -20,6 +20,8 @@  static inline int cfg80211_get_station(struct net_device *dev,
  */
 #define expected_throughput filled
 
+#define STATION_INFO_EXPECTED_THROUGHPUT    BIT(28)
+
 #endif /* < KERNEL_VERSION(3, 16, 0) */
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)
diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
index 96e73337..16552568 100644
--- a/net/batman-adv/bat_v_elp.c
+++ b/net/batman-adv/bat_v_elp.c
@@ -111,6 +111,8 @@  static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh)
 		}
 		if (ret)
 			goto default_throughput;
+		if (!(sinfo.filled & STATION_INFO_EXPECTED_THROUGHPUT))
+			goto default_throughput;
 
 		return sinfo.expected_throughput / 100;
 	}