Commit a94e22fa authored by Eric Dumazet's avatar Eric Dumazet Committed by Zheng Zengkai
Browse files

tcp: fix over estimation in sk_forced_mem_schedule() 

stable inclusion
from stable-v5.10.137
commit 8338305317dfc03622b1fedf9b23182b8c993a27
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I60PLB

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=8338305317dfc03622b1fedf9b23182b8c993a27



--------------------------------

commit c4ee1185 upstream.

sk_forced_mem_schedule() has a bug similar to ones fixed
in commit 7c80b038 ("net: fix sk_wmem_schedule() and
sk_rmem_schedule() errors")

While this bug has little chance to trigger in old kernels,
we need to fix it before the following patch.

Fixes: d83769a5 ("tcp: fix possible deadlock in tcp_send_fin()")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarSoheil Hassas Yeganeh <soheil@google.com>
Reviewed-by: default avatarShakeel Butt <shakeelb@google.com>
Reviewed-by: default avatarWei Wang <weiwan@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: default avatarWei Li <liwei391@huawei.com>
parent 7e43186b

net/ipv4/tcp_output.c

+4 −3
Original line number Diff line number Diff line
@@ -3424,11 +3424,12 @@ void tcp_xmit_retransmit_queue(struct sock *sk) 
 */

void sk_forced_mem_schedule(struct sock *sk, int size)

{

	int amt;

	int delta, amt;



	if (size <= sk->sk_forward_alloc)

	delta = size - sk->sk_forward_alloc;

	if (delta <= 0)

		return;

	amt = sk_mem_pages(size);

	amt = sk_mem_pages(delta);

	sk->sk_forward_alloc += amt * SK_MEM_QUANTUM;

	sk_memory_allocated_add(sk, amt);