summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorSoheil Hassas Yeganeh <soheil@google.com>2017-05-17 00:39:02 +0300
committerDavid S. Miller <davem@davemloft.net>2017-05-19 23:55:46 +0300
commit6f5b24eed0278136c29c27f2a7b3a2b6a202ac68 (patch)
treeb8a07f08f4d1787db97a93027c4cc8773d9c7aa8 /net
parentc6cd850d6568872f66fc4a4582f34f9b910066ca (diff)
downloadlinux-6f5b24eed0278136c29c27f2a7b3a2b6a202ac68.tar.xz
tcp: warn on negative reordering values
Commit bafbb9c73241 ("tcp: eliminate negative reordering in tcp_clean_rtx_queue") fixes an issue for negative reordering metrics. To be resilient to such errors, warn and return when a negative metric is passed to tcp_update_reordering(). Signed-off-by: Soheil Hassas Yeganeh <soheil@google.com> Signed-off-by: Neal Cardwell <ncardwell@google.com> Signed-off-by: Yuchung Cheng <ycheng@google.com> Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/tcp_input.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index bbadd79815a4..2fa55f57ac06 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -887,6 +887,9 @@ static void tcp_update_reordering(struct sock *sk, const int metric,
struct tcp_sock *tp = tcp_sk(sk);
int mib_idx;
+ if (WARN_ON_ONCE(metric < 0))
+ return;
+
if (metric > tp->reordering) {
tp->reordering = min(sysctl_tcp_max_reordering, metric);