mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

net/tls: Inform user space about send buffer availability

Browse source 
A previous fix ("tls: Fix write space handling") assumed that
user space application gets informed about the socket send buffer
availability when tls_push_sg() gets called. Inside tls_push_sg(), in
case do_tcp_sendpages() returns 0, the function returns without calling
ctx->sk_write_space. Further, the new function tls_sw_write_space()
did not invoke ctx->sk_write_space. This leads to situation that user
space application encounters a lockup always waiting for socket send
buffer to become available.

Rather than call ctx->sk_write_space from tls_push_sg(), it should be
called from tls_write_space. So whenever tcp stack invokes
sk->sk_write_space after freeing socket send buffer, we always declare
the same to user space by the way of invoking ctx->sk_write_space.

Fixes: 7463d3a2db ("tls: Fix write space handling")
Signed-off-by: Vakul Garg <vakul.garg@nxp.com>
Reviewed-by: Boris Pismenny <borisp@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vakul Garg 2019-03-12 08:22:57 +00:00 committed by David S. Miller
parent 5b5f99b186
commit 4504ab0e6e
2 changed files with 2 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
net/tls/tls_device.c
View file

@ -558,9 +558,6 @@ void tls_device_write_space(struct sock *sk, struct tls_context *ctx)
MSG_DONTWAIT | MSG_NOSIGNAL); MSG_DONTWAIT | MSG_NOSIGNAL);
sk->sk_allocation = sk_allocation; sk->sk_allocation = sk_allocation;
} }
if (!rc)
ctx->sk_write_space(sk);
} }
void handle_device_resync(struct sock *sk, u32 seq, u64 rcd_sn) void handle_device_resync(struct sock *sk, u32 seq, u64 rcd_sn)

3
net/tls/tls_main.c
View file

@ -146,7 +146,6 @@ int tls_push_sg(struct sock *sk,
} }
ctx->in_tcp_sendpages = false; ctx->in_tcp_sendpages = false;
ctx->sk_write_space(sk);
return 0; return 0;
} }
@ -228,6 +227,8 @@ static void tls_write_space(struct sock *sk)
else else
#endif #endif
tls_sw_write_space(sk, ctx); tls_sw_write_space(sk, ctx);
ctx->sk_write_space(sk);
} }
static void tls_ctx_free(struct tls_context *ctx) static void tls_ctx_free(struct tls_context *ctx)