From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org,
Stephen Hemminger <stephen@networkplumber.org>,
Neal Cardwell <ncardwell@google.com>,
Eric Dumazet <eric.dumazet@gmail.com>,
David Laight <David.Laight@ACULAB.COM>,
Doug Leith <doug.leith@nuim.ie>,
Christoph Paasch <christoph.paasch@uclouvain.be>,
"David S. Miller" <davem@davemloft.net>
Subject: [PATCH 3.15 11/26] tcp: Fix integer-overflow in TCP vegas
Date: Fri, 8 Aug 2014 14:35:18 -0700 [thread overview]
Message-ID: <20140808213414.142747061@linuxfoundation.org> (raw)
In-Reply-To: <20140808213413.648794968@linuxfoundation.org>
3.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Paasch <christoph.paasch@uclouvain.be>
[ Upstream commit 1f74e613ded11517db90b2bd57e9464d9e0fb161 ]
In vegas we do a multiplication of the cwnd and the rtt. This
may overflow and thus their result is stored in a u64. However, we first
need to cast the cwnd so that actually 64-bit arithmetic is done.
Then, we need to do do_div to allow this to be used on 32-bit arches.
Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: Neal Cardwell <ncardwell@google.com>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: David Laight <David.Laight@ACULAB.COM>
Cc: Doug Leith <doug.leith@nuim.ie>
Fixes: 8d3a564da34e (tcp: tcp_vegas cong avoid fix)
Signed-off-by: Christoph Paasch <christoph.paasch@uclouvain.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
net/ipv4/tcp_vegas.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/net/ipv4/tcp_vegas.c
+++ b/net/ipv4/tcp_vegas.c
@@ -219,7 +219,8 @@ static void tcp_vegas_cong_avoid(struct
* This is:
* (actual rate in segments) * baseRTT
*/
- target_cwnd = tp->snd_cwnd * vegas->baseRTT / rtt;
+ target_cwnd = (u64)tp->snd_cwnd * vegas->baseRTT;
+ do_div(target_cwnd, rtt);
/* Calculate the difference between the window we had,
* and the window we would like to have. This quantity
next prev parent reply other threads:[~2014-08-08 21:37 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-08 21:35 [PATCH 3.15 00/26] 3.15.10-stable review Greg Kroah-Hartman
2014-08-08 21:35 ` [PATCH 3.15 01/26] net: bcmgenet: correctly pad short packets Greg Kroah-Hartman
2014-08-08 21:35 ` [PATCH 3.15 02/26] xfrm: Fix refcount imbalance in xfrm_lookup Greg Kroah-Hartman
2014-08-08 21:35 ` [PATCH 3.15 03/26] xfrm: Fix installation of AH IPsec SAs Greg Kroah-Hartman
2014-08-08 21:35 ` [PATCH 3.15 04/26] bnx2x: fix crash during TSO tunneling Greg Kroah-Hartman
2014-08-08 21:35 ` [PATCH 3.15 05/26] net: sendmsg: fix NULL pointer dereference Greg Kroah-Hartman
2014-08-08 21:35 ` [PATCH 3.15 06/26] net: phy: re-apply PHY fixups during phy_register_device Greg Kroah-Hartman
2014-08-08 21:35 ` [PATCH 3.15 07/26] ip_tunnel(ipv4): fix tunnels with "local any remote $remote_ip" Greg Kroah-Hartman
2014-08-08 21:35 ` [PATCH 3.15 08/26] tcp: Fix integer-overflows in TCP veno Greg Kroah-Hartman
2014-08-08 21:35 ` [PATCH 3.15 09/26] inetpeer: get rid of ip_id_count Greg Kroah-Hartman
2014-08-08 21:35 ` [PATCH 3.15 10/26] ip: make IP identifiers less predictable Greg Kroah-Hartman
2014-08-08 21:35 ` Greg Kroah-Hartman [this message]
2014-08-08 21:35 ` [PATCH 3.15 12/26] bna: fix performance regression Greg Kroah-Hartman
2014-08-08 21:35 ` [PATCH 3.15 13/26] net: sctp: inherit auth_capable on INIT collisions Greg Kroah-Hartman
2014-08-08 21:35 ` [PATCH 3.15 14/26] macvlan: Initialize vlan_features to turn on offload support Greg Kroah-Hartman
2014-08-08 21:35 ` [PATCH 3.15 15/26] net: Correctly set segment mac_len in skb_segment() Greg Kroah-Hartman
2014-08-08 21:35 ` [PATCH 3.15 16/26] iovec: make sure the caller actually wants anything in memcpy_fromiovecend Greg Kroah-Hartman
2014-08-08 21:35 ` [PATCH 3.15 17/26] batman-adv: Fix out-of-order fragmentation support Greg Kroah-Hartman
2014-08-08 21:35 ` [PATCH 3.15 18/26] sctp: fix possible seqlock seadlock in sctp_packet_transmit() Greg Kroah-Hartman
2014-08-08 21:35 ` [PATCH 3.15 19/26] sparc: Hook up renameat2 syscall Greg Kroah-Hartman
2014-08-08 21:35 ` [PATCH 3.15 20/26] sparc64: Do not insert non-valid PTEs into the TSB hash table Greg Kroah-Hartman
2014-08-08 21:35 ` [PATCH 3.15 21/26] sparc64: Guard against flushing openfirmware mappings Greg Kroah-Hartman
2014-08-08 21:35 ` [PATCH 3.15 22/26] bbc-i2c: Fix BBC I2C envctrl on SunBlade 2000 Greg Kroah-Hartman
2014-08-08 21:35 ` [PATCH 3.15 23/26] sunsab: Fix detection of BREAK on sunsab serial console Greg Kroah-Hartman
2014-08-08 21:35 ` [PATCH 3.15 24/26] sparc64: ldc_connect() should not return EINVAL when handshake is in progress Greg Kroah-Hartman
2014-08-08 21:35 ` [PATCH 3.15 25/26] arch/sparc/math-emu/math_32.c: drop stray break operator Greg Kroah-Hartman
2014-08-08 21:35 ` [PATCH 3.15 26/26] xfs: log vector rounding leaks log space Greg Kroah-Hartman
2014-08-09 3:02 ` [PATCH 3.15 00/26] 3.15.10-stable review Guenter Roeck
2014-08-09 14:42 ` Shuah Khan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140808213414.142747061@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=David.Laight@ACULAB.COM \
--cc=christoph.paasch@uclouvain.be \
--cc=davem@davemloft.net \
--cc=doug.leith@nuim.ie \
--cc=eric.dumazet@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=ncardwell@google.com \
--cc=stable@vger.kernel.org \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.