From: Jakub Kicinski <jakub.kicinski@netronome.com>
To: davem@davemloft.net, john.fastabend@gmail.com
Cc: netdev@vger.kernel.org, oss-drivers@netronome.com,
borisp@mellanox.com, aviadye@mellanox.com, daniel@iogearbox.net,
Jakub Kicinski <jakub.kicinski@netronome.com>,
Simon Horman <simon.horman@netronome.com>
Subject: [PATCH net 1/8] net/tls: take into account that bpf_exec_tx_verdict() may free the record
Date: Wed, 27 Nov 2019 12:16:39 -0800 [thread overview]
Message-ID: <20191127201646.25455-2-jakub.kicinski@netronome.com> (raw)
In-Reply-To: <20191127201646.25455-1-jakub.kicinski@netronome.com>
bpf_exec_tx_verdict() may free the record if tls_push_record()
fails, or if the entire record got consumed by BPF. Re-check
ctx->open_rec before touching the data.
Fixes: d3b18ad31f93 ("tls: add bpf support to sk_msg handling")
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
---
net/tls/tls_sw.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index da9f9ce51e7b..70e3c0c1af50 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -984,7 +984,7 @@ int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
num_async++;
else if (ret == -ENOMEM)
goto wait_for_memory;
- else if (ret == -ENOSPC)
+ else if (ctx->open_rec && ret == -ENOSPC)
goto rollback_iter;
else if (ret != -EAGAIN)
goto send_end;
@@ -1053,11 +1053,12 @@ int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
ret = sk_stream_wait_memory(sk, &timeo);
if (ret) {
trim_sgl:
- tls_trim_both_msgs(sk, orig_size);
+ if (ctx->open_rec)
+ tls_trim_both_msgs(sk, orig_size);
goto send_end;
}
- if (msg_en->sg.size < required_size)
+ if (ctx->open_rec && msg_en->sg.size < required_size)
goto alloc_encrypted;
}
@@ -1190,11 +1191,13 @@ static int tls_sw_do_sendpage(struct sock *sk, struct page *page,
wait_for_memory:
ret = sk_stream_wait_memory(sk, &timeo);
if (ret) {
- tls_trim_both_msgs(sk, msg_pl->sg.size);
+ if (ctx->open_rec)
+ tls_trim_both_msgs(sk, msg_pl->sg.size);
goto sendpage_end;
}
- goto alloc_payload;
+ if (ctx->open_rec)
+ goto alloc_payload;
}
if (num_async) {
--
2.23.0
next prev parent reply other threads:[~2019-11-27 20:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-27 20:16 [PATCH net 0/8] net: tls: fix scatter-gather list issues Jakub Kicinski
2019-11-27 20:16 ` Jakub Kicinski [this message]
2019-11-28 4:40 ` [PATCH net 1/8] net/tls: take into account that bpf_exec_tx_verdict() may free the record John Fastabend
2019-11-27 20:16 ` [PATCH net 2/8] net/tls: free the record on encryption error Jakub Kicinski
2019-11-28 4:41 ` John Fastabend
2019-11-27 20:16 ` [PATCH net 3/8] net: skmsg: fix TLS 1.3 crash with full sk_msg Jakub Kicinski
2019-11-27 20:16 ` [PATCH net 4/8] selftests/tls: add a test for fragmented messages Jakub Kicinski
2019-11-27 20:16 ` [PATCH net 5/8] net/tls: remove the dead inplace_crypto code Jakub Kicinski
2019-11-27 20:16 ` [PATCH net 6/8] net/tls: use sg_next() to walk sg entries Jakub Kicinski
2019-11-27 20:16 ` [PATCH net 7/8] selftests: bpf: test_sockmap: handle file creation failures gracefully Jakub Kicinski
2019-11-27 20:16 ` [PATCH net 8/8] selftests: bpf: correct perror strings Jakub Kicinski
2019-11-29 6:44 ` [PATCH net 0/8] net: tls: fix scatter-gather list issues David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191127201646.25455-2-jakub.kicinski@netronome.com \
--to=jakub.kicinski@netronome.com \
--cc=aviadye@mellanox.com \
--cc=borisp@mellanox.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=john.fastabend@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=oss-drivers@netronome.com \
--cc=simon.horman@netronome.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).