mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-16 04:04:06 +00:00
tcp: fix over estimation in sk_forced_mem_schedule()
commitc4ee118561
upstream. sk_forced_mem_schedule() has a bug similar to ones fixed in commit7c80b038d2
("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:d83769a580
("tcp: fix possible deadlock in tcp_send_fin()") Signed-off-by: Eric Dumazet <edumazet@google.com> Acked-by: Soheil Hassas Yeganeh <soheil@google.com> Reviewed-by: Shakeel Butt <shakeelb@google.com> Reviewed-by: Wei Wang <weiwan@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
bfbbde0940
commit
7c99a9b118
1 changed files with 4 additions and 3 deletions
|
@ -3372,11 +3372,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);
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue