summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi RongQing <lirongqing@baidu.com>2018-11-09 17:04:51 +0800
committerDavid S. Miller <davem@davemloft.net>2018-11-09 15:16:29 -0800
commite6e8869aed897a021fafa6f412e9e4b7e2ea6cd3 (patch)
tree616f7baee9ce68fb1ab53b45b5af1c3e47fbb5dc
parent307f39b021995db67b2f39da7af006e2376fb452 (diff)
downloadtalos-obmc-linux-e6e8869aed897a021fafa6f412e9e4b7e2ea6cd3.tar.gz
talos-obmc-linux-e6e8869aed897a021fafa6f412e9e4b7e2ea6cd3.zip
net: tcp: remove BUG_ON from tcp_v4_err
if skb is NULL pointer, and the following access of skb's skb_mstamp_ns will trigger panic, which is same as BUG_ON Signed-off-by: Li RongQing <lirongqing@baidu.com> Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/tcp_ipv4.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index a336787d75e5..5424a4077c27 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -542,7 +542,6 @@ int tcp_v4_err(struct sk_buff *icmp_skb, u32 info)
icsk->icsk_rto = inet_csk_rto_backoff(icsk, TCP_RTO_MAX);
skb = tcp_rtx_queue_head(sk);
- BUG_ON(!skb);
tcp_mstamp_refresh(tp);
delta_us = (u32)(tp->tcp_mstamp - tcp_skb_timestamp_us(skb));
OpenPOWER on IntegriCloud