aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Fedorenko <vfedorenko@novek.ru>2020-05-20 11:41:44 +0300
committerDavid S. Miller <davem@davemloft.net>2020-05-21 17:20:06 -0700
commit635d9398178659d8ddba79dd061f9451cec0b4d1 (patch)
tree57d5ed24720738b99f0af664b99cb6648bbc2aa9
parenta7bff11f6f9afa87c25711db8050c9b5324db0e2 (diff)
downloadlinux-stericsson-635d9398178659d8ddba79dd061f9451cec0b4d1.tar.gz
net/tls: free record only on encryption error
We cannot free record on any transient error because it leads to losing previos data. Check socket error to know whether record must be freed or not. Fixes: d10523d0b3d7 ("net/tls: free the record on encryption error") Signed-off-by: Vadim Fedorenko <vfedorenko@novek.ru> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/tls/tls_sw.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 57f80823330e..2d399b6c4075 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -796,9 +796,10 @@ 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 && err != -EINPROGRESS) {
+ if (err && sk->sk_err == EBADMSG) {
*copied -= sk_msg_free(sk, msg);
tls_free_open_rec(sk);
+ err = -sk->sk_err;
}
if (psock)
sk_psock_put(sk, psock);
@@ -824,9 +825,10 @@ more_data:
switch (psock->eval) {
case __SK_PASS:
err = tls_push_record(sk, flags, record_type);
- if (err && err != -EINPROGRESS) {
+ if (err && sk->sk_err == EBADMSG) {
*copied -= sk_msg_free(sk, msg);
tls_free_open_rec(sk);
+ err = -sk->sk_err;
goto out_err;
}
break;