diff mbox

batman-adv: Fix integer overflow in batadv_iv_ogm_calc_tq

Message ID 1455616027-22089-1-git-send-email-sven@open-mesh.com (mailing list archive)
State Accepted, archived
Delegated to: Marek Lindner
Headers

Commit Message

Sven Eckelmann Feb. 16, 2016, 9:47 a.m. UTC 
  From: Sven Eckelmann <sven.eckelmann@open-mesh.com>

The undefined behavior sanatizer detected an signed integer overflow in a
setup with near perfect link quality

    UBSAN: Undefined behaviour in net/batman-adv/bat_iv_ogm.c:1246:25
    signed integer overflow:
    8713350 * 255 cannot be represented in type 'int'

The problems happens because the calculation of mixed unsigned and signed
integers resulted in an integer multiplication.

      batadv_ogm_packet::tq (u8 255)
    * tq_own (u8 255)
    * tq_asym_penalty (int 134; max 255)
    * tq_iface_penalty (int 255; max 255)

The tq_iface_penalty, tq_asym_penalty and inv_asym_penalty can just be
changed to unsigned int because they are not expected to become negative.

Fixes: 46e44fdb96ef ("batman-adv: add WiFi penalty")
Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
---
 net/batman-adv/bat_iv_ogm.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Marek Lindner Feb. 28, 2016, 4:38 a.m. UTC | #1 
On Tuesday, February 16, 2016 10:47:07 Sven Eckelmann wrote:
> From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
> 
> The undefined behavior sanatizer detected an signed integer overflow in a
> setup with near perfect link quality
> 
>     UBSAN: Undefined behaviour in net/batman-adv/bat_iv_ogm.c:1246:25
>     signed integer overflow:
>     8713350 * 255 cannot be represented in type 'int'
> 
> The problems happens because the calculation of mixed unsigned and signed
> integers resulted in an integer multiplication.
> 
>       batadv_ogm_packet::tq (u8 255)
>     * tq_own (u8 255)
>     * tq_asym_penalty (int 134; max 255)
>     * tq_iface_penalty (int 255; max 255)
> 
> The tq_iface_penalty, tq_asym_penalty and inv_asym_penalty can just be
> changed to unsigned int because they are not expected to become negative.
> 
> Fixes: 46e44fdb96ef ("batman-adv: add WiFi penalty")
> Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
> ---
>  net/batman-adv/bat_iv_ogm.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)

Applied in revision 789b846.

Thanks,
Marek
diff mbox

Patch

diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index cb2d1b9..b71b57e 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -1147,9 +1147,10 @@  static int batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node,
 	u8 total_count;
 	u8 orig_eq_count, neigh_rq_count, neigh_rq_inv, tq_own;
 	unsigned int neigh_rq_inv_cube, neigh_rq_max_cube;
-	int tq_asym_penalty, inv_asym_penalty, if_num, ret = 0;
+	int if_num, ret = 0;
+	unsigned int tq_asym_penalty, inv_asym_penalty;
 	unsigned int combined_tq;
-	int tq_iface_penalty;
+	unsigned int tq_iface_penalty;
 
 	/* find corresponding one hop neighbor */
 	rcu_read_lock();