Skip to content

Commit ec791d8

Browse files
Lu Weidavem330
authored andcommitted
tcp: fix a signed-integer-overflow bug in tcp_add_backlog()
The type of sk_rcvbuf and sk_sndbuf in struct sock is int, and in tcp_add_backlog(), the variable limit is caculated by adding sk_rcvbuf, sk_sndbuf and 64 * 1024, it may exceed the max value of int and overflow. This patch reduces the limit budget by halving the sndbuf to solve this issue since ACK packets are much smaller than the payload. Fixes: c9c3321 ("tcp: add tcp_add_backlog()") Signed-off-by: Lu Wei <luwei32@huawei.com> Reviewed-by: Eric Dumazet <edumazet@google.com> Acked-by: Kuniyuki Iwashima <kuniyu@amazon.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 9c1eaa2 commit ec791d8

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

net/ipv4/tcp_ipv4.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1874,11 +1874,13 @@ bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb,
18741874
__skb_push(skb, hdrlen);
18751875

18761876
no_coalesce:
1877+
limit = (u32)READ_ONCE(sk->sk_rcvbuf) + (u32)(READ_ONCE(sk->sk_sndbuf) >> 1);
1878+
18771879
/* Only socket owner can try to collapse/prune rx queues
18781880
* to reduce memory overhead, so add a little headroom here.
18791881
* Few sockets backlog are possibly concurrently non empty.
18801882
*/
1881-
limit = READ_ONCE(sk->sk_rcvbuf) + READ_ONCE(sk->sk_sndbuf) + 64*1024;
1883+
limit += 64 * 1024;
18821884

18831885
if (unlikely(sk_add_backlog(sk, skb, limit))) {
18841886
bh_unlock_sock(sk);

0 commit comments

Comments
 (0)