ccid3: Divide by zero fix
PATCH 4/4 ccid3: Divide by zero fix
In rare circumstances 0 is returned by dccp_li_hist_calc_i_mean which leads to a divide by zero in ccid3_hc_rx_packet_recv. Explicitly check for zero return now. Update copyright notice at same time.
Found by Arnaldo.
Signed-off-by Ian McDonald <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
net/dccp/ccids/ccid3.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-)
8135f5c98f27d04094f7931495a917d856192f6a
net/dccp/ccids/ccid3.c +7 -3
@@ -2,7 +2,7 @@* net/dccp/ccids/ccid3.c * * Copyright (c) 2005 The University of Waikato, Hamilton, New Zealand. -* Copyright (c) 2005 Ian McDonald <[email protected]> +* Copyright (c) 2005-6 Ian McDonald <[email protected]> * * An implementation of the DCCP protocol *
@@ -1014,9 +1014,13 @@ static void ccid3_hc_rx_packet_recv(stru p_prev = hcrx->ccid3hcrx_p;/* Calculate loss event rate */ -if (!list_empty (&hcrx->ccid3hcrx_li_hist)) +if (!list_empty (&hcrx->ccid3hcrx_li_hist)) { +u32 i_mean =dccp_li_hist_calc_i_mean (&hcrx->ccid3hcrx_li_hist); +/* Scaling up by 1000000 as fixed decimal */ - hcrx->ccid3hcrx_p =1000000 /dccp_li_hist_calc_i_mean (&hcrx->ccid3hcrx_li_hist); +if (i_mean !=0 ) + hcrx->ccid3hcrx_p =1000000 / i_mean; + }if (hcrx->ccid3hcrx_p > p_prev) {ccid3_hc_rx_send_feedback (sk);
Signature · 1 line
1.2.2.gd27d