| From 84b9702bf77c1a8b0baadac55a015e85c615f43c Mon Sep 17 00:00:00 2001 |
| From: Jakub Kicinski <jakub.kicinski@netronome.com> |
| Date: Wed, 27 Nov 2019 12:16:40 -0800 |
| Subject: [PATCH] net/tls: free the record on encryption error |
| |
| commit d10523d0b3d78153ee58d19853ced26c9004c8c4 upstream. |
| |
| When tls_do_encryption() fails the SG lists are left with the |
| SG_END and SG_CHAIN marks in place. One could hope that once |
| encryption fails we will never see the record again, but that |
| is in fact not true. Commit d3b18ad31f93 ("tls: add bpf support |
| to sk_msg handling") added special handling to ENOMEM and ENOSPC |
| errors which mean we may see the same record re-submitted. |
| |
| As suggested by John free the record, the BPF code is already |
| doing just that. |
| |
| Reported-by: syzbot+df0d4ec12332661dd1f9@syzkaller.appspotmail.com |
| 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> |
| Acked-by: John Fastabend <john.fastabend@gmail.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c |
| index 9c56f67541b9..27753e184695 100644 |
| --- a/net/tls/tls_sw.c |
| +++ b/net/tls/tls_sw.c |
| @@ -766,8 +766,14 @@ static int bpf_exec_tx_verdict(struct sk_msg *msg, struct sock *sk, |
| |
| policy = !(flags & MSG_SENDPAGE_NOPOLICY); |
| psock = sk_psock_get(sk); |
| - if (!psock || !policy) |
| - return tls_push_record(sk, flags, record_type); |
| + if (!psock || !policy) { |
| + err = tls_push_record(sk, flags, record_type); |
| + if (err) { |
| + *copied -= sk_msg_free(sk, msg); |
| + tls_free_open_rec(sk); |
| + } |
| + return err; |
| + } |
| more_data: |
| enospc = sk_msg_full(msg); |
| if (psock->eval == __SK_NONE) { |
| -- |
| 2.7.4 |
| |
