Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[DCCP] ccid3: Divide by zero fix

Browse source 
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 <imcdnzl@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ian McDonald 2006-03-03 17:54:46 -08:00 committed by David S. Miller
parent c027f5f995
commit c09966608d
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
net/dccp/ccids/ccid3.c
View file

@ -2,7 +2,7 @@
* net/dccp/ccids/ccid3.c * net/dccp/ccids/ccid3.c
* *
* Copyright (c) 2005 The University of Waikato, Hamilton, New Zealand. * Copyright (c) 2005 The University of Waikato, Hamilton, New Zealand.
* Copyright (c) 2005 Ian McDonald <iam4@cs.waikato.ac.nz> * Copyright (c) 2005-6 Ian McDonald <imcdnzl@gmail.com>
* *
* An implementation of the DCCP protocol * An implementation of the DCCP protocol
* *
@ -1033,9 +1033,13 @@ static void ccid3_hc_rx_packet_recv(struct sock *sk, struct sk_buff *skb)
p_prev = hcrx->ccid3hcrx_p; p_prev = hcrx->ccid3hcrx_p;
/* Calculate loss event rate */ /* 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 */ /* 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) { if (hcrx->ccid3hcrx_p > p_prev) {
ccid3_hc_rx_send_feedback(sk); ccid3_hc_rx_send_feedback(sk);