[linux-next] LinuxNextTracking branch, master, updated. next-20150818

batman at open-mesh.org batman at open-mesh.org
Wed Aug 19 00:15:52 CEST 2015


The following commit has been merged in the master branch:
commit 571a963768e7711e0bb5a30f71247b46ec9ca7b9
Author: Ruben Wisniewski <ruben at freifunk-nrw.de>
Date:   Tue Jun 16 21:06:23 2015 +0200

    batman-adv: Avoid u32 overflow during gateway select
    
    The gateway selection based on fast connections is using a single value
    calculated from the average tq (0-255) and the download bandwidth (in
    100Kibit). The formula for the first step (tq ** 2 * 10000 * bandwidth)
    tends to overflow a u32 with low bandwidth settings like 50 [100KiBit]
    and a tq value of over 92.
    
    Changing this to a 64 bit unsigned integer allows to support a
    bandwidth_down with up to ~2.8e10 [100KiBit] and a perfect tq of 255. This
    is ~6.6 times higher than the maximum possible value of the gateway
    announcement TVLV.
    
    This problem only affects the non-default gw_sel_class 1.
    
    Signed-off-by: Ruben Wisniewsi <ruben at vfn-nrw.de>
    [sven at narfation.org: rewritten commit message]
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>
    Signed-off-by: Antonio Quartulli <antonio at meshcoding.com>

diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index e1e1f31..4ac24d8 100644
--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
@@ -153,7 +153,7 @@ batadv_gw_get_best_gw_node(struct batadv_priv *bat_priv)
 	struct batadv_neigh_node *router;
 	struct batadv_neigh_ifinfo *router_ifinfo;
 	struct batadv_gw_node *gw_node, *curr_gw = NULL;
-	uint32_t max_gw_factor = 0, tmp_gw_factor = 0;
+	uint64_t max_gw_factor = 0, tmp_gw_factor = 0;
 	uint8_t max_tq = 0;
 	uint8_t tq_avg;
 	struct batadv_orig_node *orig_node;

-- 
LinuxNextTracking


More information about the linux-merge mailing list