Commit b2d31640 authored Oct 08, 2020 by Rohit Maheshwari Committed by Greg Kroah-Hartman Oct 29, 2020

net/tls: sendfile fails with ktls offload



[ Upstream commit ea1dd3e9d080c961b9a451130b61c72dc9a5397b ]

At first when sendpage gets called, if there is more data, 'more' in
tls_push_data() gets set which later sets pending_open_record_frags, but
when there is no more data in file left, and last time tls_push_data()
gets called, pending_open_record_frags doesn't get reset. And later when
2 bytes of encrypted alert comes as sendmsg, it first checks for
pending_open_record_frags, and since this is set, it creates a record with
0 data bytes to encrypt, meaning record length is prepend_size + tag_size
only, which causes problem.
 We should set/reset pending_open_record_frags based on more bit.

Fixes: e8f69799 ("net/tls: Add generic NIC offload infrastructure")
Signed-off-by: Rohit Maheshwari <rohitm@chelsio.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 7bf51ad6

net/tls/tls_device.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -351,13 +351,13 @@ static int tls_push_data(struct sock *sk,
		struct tls_context *tls_ctx = tls_get_ctx(sk);
		struct tls_offload_context_tx *ctx = tls_offload_ctx_tx(tls_ctx);
		int tls_push_record_flags = flags \| MSG_SENDPAGE_NOTLAST;
		int more = flags & (MSG_SENDPAGE_NOTLAST \| MSG_MORE);
		struct tls_record_info *record = ctx->open_record;
		struct page_frag *pfrag;
		size_t orig_size = size;
		u32 max_open_record_len;
		int copy, rc = 0;
		bool more = false;
		bool done = false;
		int copy, rc = 0;
		long timeo;

		if (flags &
		@@ -422,9 +422,8 @@ static int tls_push_data(struct sock *sk,
		if (!size) {
		last_record:
		tls_push_record_flags = flags;
		if (more) {
		tls_ctx->pending_open_record_frags =
		record->num_frags;
		if (flags & (MSG_SENDPAGE_NOTLAST \| MSG_MORE)) {
		more = true;
		break;
		}

		@@ -445,6 +444,8 @@ static int tls_push_data(struct sock *sk,
		}
		} while (!done);

		tls_ctx->pending_open_record_frags = more;

		if (orig_size - size > 0)
		rc = orig_size - size;