Commit dde06aaa authored by Jakub Kicinski's avatar Jakub Kicinski

tls: rx: release the sock lock on locking timeout

Eric reports we should release the socket lock if the entire
"grab reader lock" operation has failed. The callers assume
they don't have to release it or otherwise unwind.
Reported-by: default avatarEric Dumazet <edumazet@google.com>
Reported-by: syzbot+16e72110feb2b653ef27@syzkaller.appspotmail.com
Fixes: 4cbc325e ("tls: rx: allow only one reader at a time")
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20220720203701.2179034-1-kuba@kernel.orgSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent b945804d
...@@ -1803,6 +1803,7 @@ static long tls_rx_reader_lock(struct sock *sk, struct tls_sw_context_rx *ctx, ...@@ -1803,6 +1803,7 @@ static long tls_rx_reader_lock(struct sock *sk, struct tls_sw_context_rx *ctx,
bool nonblock) bool nonblock)
{ {
long timeo; long timeo;
int err;
lock_sock(sk); lock_sock(sk);
...@@ -1818,15 +1819,23 @@ static long tls_rx_reader_lock(struct sock *sk, struct tls_sw_context_rx *ctx, ...@@ -1818,15 +1819,23 @@ static long tls_rx_reader_lock(struct sock *sk, struct tls_sw_context_rx *ctx,
!READ_ONCE(ctx->reader_present), &wait); !READ_ONCE(ctx->reader_present), &wait);
remove_wait_queue(&ctx->wq, &wait); remove_wait_queue(&ctx->wq, &wait);
if (!timeo) if (timeo <= 0) {
return -EAGAIN; err = -EAGAIN;
if (signal_pending(current)) goto err_unlock;
return sock_intr_errno(timeo); }
if (signal_pending(current)) {
err = sock_intr_errno(timeo);
goto err_unlock;
}
} }
WRITE_ONCE(ctx->reader_present, 1); WRITE_ONCE(ctx->reader_present, 1);
return timeo; return timeo;
err_unlock:
release_sock(sk);
return err;
} }
static void tls_rx_reader_unlock(struct sock *sk, struct tls_sw_context_rx *ctx) static void tls_rx_reader_unlock(struct sock *sk, struct tls_sw_context_rx *ctx)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment