Commit e062fe99 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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: 692d7b5d ("tls: Fix recvmsg() to be able to peek across multiple records")
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d87d67fd

net/tls/tls_sw.c

+25 −8
Original line number Original line Diff line number Diff line
@@ -2005,6 +2005,7 @@ ssize_t tls_sw_splice_read(struct socket *sock, loff_t *ppos, 
	struct sock *sk = sock->sk;

	struct sock *sk = sock->sk;

	struct sk_buff *skb;

	struct sk_buff *skb;

	ssize_t copied = 0;

	ssize_t copied = 0;

	bool from_queue;

	int err = 0;

	int err = 0;

	long timeo;

	long timeo;

	int chunk;

	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);

	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)

		if (!skb)

			goto splice_read_end;

			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);

			tls_err_abort(sk, -EBADMSG);

			goto splice_read_end;

			goto splice_read_end;

		}

		}

	}





	/* splice does not support reading control messages */

	/* splice does not support reading control messages */

	if (ctx->control != TLS_RECORD_TYPE_DATA) {

	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)

	if (copied < 0)

		goto splice_read_end;

		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:

splice_read_end:

	release_sock(sk);

	release_sock(sk);