tcp: fix a signed-integer-overflow bug in tcp_add_backlog()
Subsystems (3)
PATCH v3 1/1 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.
--- net/ipv4/tcp_ipv4.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/ipv4/tcp_ipv4.c +3 -1
@@ -1874,11 +1874,13 @@ bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb,__skb_push (skb, hdrlen); no_coalesce: + limit = (u32 )READ_ONCE (sk->sk_rcvbuf) + (u32)(READ_ONCE (sk->sk_sndbuf) >>1 ); +/* Only socket owner can try to collapse/prune rx queues * to reduce memory overhead, so add a little headroom here. * Few sockets backlog are possibly concurrently non empty. */ - limit =READ_ONCE (sk->sk_rcvbuf) +READ_ONCE (sk->sk_sndbuf) +64 *1024 ; + limit +=64 *1024 ;if (unlikely (sk_add_backlog (sk, skb, limit))) {bh_unlock_sock (sk);
Signature · 1 line
2.31.1
Quoted 10 lines · Lu Wei
The type of
sk_rcvbufandsk_sndbufin struct sock is int, and intcp_add_backlog(), the variable limit is caculated by addingsk_rcvbuf,sk_sndbufand 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 c9c3321257e1 ("tcp: add tcp_add_backlog()")Signed-off-by Lu Wei <[email protected]>
From: Lu Wei <[email protected]> Date: Fri, 21 Oct 2022 12:06:22 +0800
Quoted 9 lines
The type of
sk_rcvbufandsk_sndbufin struct sock is int, and intcp_add_backlog(), the variable limit is caculated by addingsk_rcvbuf,sk_sndbufand 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 c9c3321257e1 ("tcp: add tcp_add_backlog()")Signed-off-by Lu Wei <[email protected]>
Quoted 25 lines
--- net/ipv4/tcp_ipv4.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)net/ipv4/tcp_ipv4.c +3
-1@@ -1874,11 +1874,13 @@ bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb,__skb_push (skb, hdrlen); no_coalesce: + limit = (u32 )READ_ONCE (sk->sk_rcvbuf) + (u32)(READ_ONCE (sk->sk_sndbuf) >>1 ); +/* Only socket owner can try to collapse/prune rx queues * to reduce memory overhead, so add a little headroom here. * Few sockets backlog are possibly concurrently non empty. */ - limit =READ_ONCE (sk->sk_rcvbuf) +READ_ONCE (sk->sk_sndbuf) +64 *1024 ; + limit +=64 *1024 ;if (unlikely (sk_add_backlog (sk, skb, limit))) {bh_unlock_sock (sk);Signature · 1 line
2.31.1
This patch was applied to netdev/net.git (master) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by David S. Miller <[email protected]>:
Quoted 8 lines · On Fri, 21 Oct 2022 12:06:22 +0800 you wrote:
The type of
sk_rcvbufandsk_sndbufin struct sock is int, and intcp_add_backlog(), the variable limit is caculated by addingsk_rcvbuf,sk_sndbufand 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.[...]
Here is the summary with links:
- [net,v3] tcp: fix a signed-integer-overflow bug in tcp_add_backlog()
https://git.kernel.org/netdev/net/c/ec791d8149ff
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html