Skip to content

Commit 7d2a44b

Browse files
ecsvgregkh
authored andcommitted
batman-adv: tp_meter: avoid divide-by-zero for dec_cwnd
commit 33ccd52 upstream. The cwnd is always MSS <= cwnd <= 0x20000000. But the calculation in batadv_tp_update_cwnd() assumes unsigned 32 bit arithmetics. ((mss * 8) ** 2) / (cwnd * 8) In case cwnd is actually 0x20000000, it will be shifted by 3 bit to the left end up at 0x100000000 or U32_MAX + 1. It will therefore wrap around and be 0 - resulting in: ((mss * 8) ** 2) / 0 This is of course invalid and cannot be calculated. The calculation should must be simplified to avoid this overflow: (mss ** 2) * 8 / cwnd It will keep the precision enhancement from the scaling (by 8) but avoid the overflow in the divisor. In theory, there could still be an overflow in the dividend. It is at the moment fixed to BATADV_TP_PLEN in batadv_tp_recv_ack() - so it is not an imminent problem. But allowing it to use the whole u32 bit range, would mean that it can still use up to 67 bits. To keep this calculation safe for 32 bit arithmetic, mss must never use more than floor((32 - 3) / 2) bits - or in other words: must never be larger than 16383. Cc: stable@kernel.org Fixes: 33a3bb4 ("batman-adv: throughput meter implementation") Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 8e77fe0 commit 7d2a44b

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

net/batman-adv/tp_meter.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,12 @@ static void batadv_tp_update_cwnd(struct batadv_tp_vars *tp_vars, u32 mss)
154154
return;
155155
}
156156

157+
/* prevent overflow in (mss * mss) << 3 */
158+
mss = min_t(u32, mss, (1U << 14) - 1);
159+
157160
/* increment CWND at least of 1 (section 3.1 of RFC5681) */
158161
tp_vars->dec_cwnd += max_t(u32, 1U << 3,
159-
((mss * mss) << 6) / (tp_vars->cwnd << 3));
162+
((mss * mss) << 3) / tp_vars->cwnd);
160163
if (tp_vars->dec_cwnd < (mss << 3)) {
161164
spin_unlock_bh(&tp_vars->cwnd_lock);
162165
return;

0 commit comments

Comments
 (0)