Commit db885e66 authored Jan 10, 2020 by Jakub Kicinski Committed by David S. Miller Jan 10, 2020

net/tls: fix async operation



Mallesham reports the TLS with async accelerator was broken by
commit d10523d0 ("net/tls: free the record on encryption error")
because encryption can return -EINPROGRESS in such setups, which
should not be treated as an error.

The error is also present in the BPF path (likely copied from there).

Reported-by: Mallesham Jatharakonda <mallesham.jatharakonda@oneconvergence.com>
Fixes: d3b18ad3 ("tls: add bpf support to sk_msg handling")
Fixes: d10523d0 ("net/tls: free the record on encryption error")
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 5c5d22a7

net/tls/tls_sw.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -770,7 +770,7 @@ static int bpf_exec_tx_verdict(struct sk_msg msg, struct sock sk,
		psock = sk_psock_get(sk);
		if (!psock \|\| !policy) {
		err = tls_push_record(sk, flags, record_type);
		if (err) {
		if (err && err != -EINPROGRESS) {
		*copied -= sk_msg_free(sk, msg);
		tls_free_open_rec(sk);
		}
		@@ -799,7 +799,7 @@ more_data:
		switch (psock->eval) {
		case __SK_PASS:
		err = tls_push_record(sk, flags, record_type);
		if (err < 0) {
		if (err && err != -EINPROGRESS) {
		*copied -= sk_msg_free(sk, msg);
		tls_free_open_rec(sk);
		goto out_err;

Admin message