lkml.org 
[lkml]   [2019]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.3 123/135] net/tls: free the record on encryption error
    Date
    From: Jakub Kicinski <jakub.kicinski@netronome.com>

    [ Upstream commit d10523d0b3d78153ee58d19853ced26c9004c8c4 ]

    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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/tls/tls_sw.c | 10 ++++++++--
    1 file changed, 8 insertions(+), 2 deletions(-)

    --- a/net/tls/tls_sw.c
    +++ b/net/tls/tls_sw.c
    @@ -766,8 +766,14 @@ static int bpf_exec_tx_verdict(struct 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) {

    \
     
     \ /
      Last update: 2019-12-03 23:44    [W:3.043 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site