| Message ID | 1541754291-8659-1-git-send-email-lirongqing@baidu.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] net: tcp: remove BUG_ON from tcp_v4_err | expand |
On 11/09/2018 01:04 AM, Li RongQing wrote: > 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> > --- > net/ipv4/tcp_ipv4.c | 1 - > 1 file changed, 1 deletion(-) > > 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)); > SGTM, thanks. Signed-off-by: Eric Dumazet <edumazet@google.com>
From: Li RongQing <lirongqing@baidu.com> Date: Fri, 9 Nov 2018 17:04:51 +0800 > 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> Applied.
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));
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> --- net/ipv4/tcp_ipv4.c | 1 - 1 file changed, 1 deletion(-)