tls: splice_read: fix accessing pre-processed records
recvmsg() will put peek()ed and partially read records onto the rx_list.
splice_read() needs to consult that list otherwise it may miss data.
Align with recvmsg() and also put partially-read records onto rx_list.
tls_sw_advance_skb() is pretty pointless now and will be removed in
net-next.
Fixes: 692d7b5d1f
("tls: Fix recvmsg() to be able to peek across multiple records")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Родитель
d87d67fd61
Коммит
e062fe99cc
|
@ -2005,6 +2005,7 @@ ssize_t tls_sw_splice_read(struct socket *sock, loff_t *ppos,
|
|||
struct sock *sk = sock->sk;
|
||||
struct sk_buff *skb;
|
||||
ssize_t copied = 0;
|
||||
bool from_queue;
|
||||
int err = 0;
|
||||
long timeo;
|
||||
int chunk;
|
||||
|
@ -2014,7 +2015,12 @@ ssize_t tls_sw_splice_read(struct socket *sock, loff_t *ppos,
|
|||
|
||||
timeo = sock_rcvtimeo(sk, flags & SPLICE_F_NONBLOCK);
|
||||
|
||||
skb = tls_wait_data(sk, NULL, flags & SPLICE_F_NONBLOCK, timeo, &err);
|
||||
from_queue = !skb_queue_empty(&ctx->rx_list);
|
||||
if (from_queue) {
|
||||
skb = __skb_dequeue(&ctx->rx_list);
|
||||
} else {
|
||||
skb = tls_wait_data(sk, NULL, flags & SPLICE_F_NONBLOCK, timeo,
|
||||
&err);
|
||||
if (!skb)
|
||||
goto splice_read_end;
|
||||
|
||||
|
@ -2023,6 +2029,7 @@ ssize_t tls_sw_splice_read(struct socket *sock, loff_t *ppos,
|
|||
tls_err_abort(sk, -EBADMSG);
|
||||
goto splice_read_end;
|
||||
}
|
||||
}
|
||||
|
||||
/* splice does not support reading control messages */
|
||||
if (ctx->control != TLS_RECORD_TYPE_DATA) {
|
||||
|
@ -2037,7 +2044,17 @@ ssize_t tls_sw_splice_read(struct socket *sock, loff_t *ppos,
|
|||
if (copied < 0)
|
||||
goto splice_read_end;
|
||||
|
||||
tls_sw_advance_skb(sk, skb, copied);
|
||||
if (!from_queue) {
|
||||
ctx->recv_pkt = NULL;
|
||||
__strp_unpause(&ctx->strp);
|
||||
}
|
||||
if (chunk < rxm->full_len) {
|
||||
__skb_queue_head(&ctx->rx_list, skb);
|
||||
rxm->offset += len;
|
||||
rxm->full_len -= len;
|
||||
} else {
|
||||
consume_skb(skb);
|
||||
}
|
||||
|
||||
splice_read_end:
|
||||
release_sock(sk);
|
||||
|
|
Загрузка…
Ссылка в новой задаче