Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Unverified Commit 1a4d6336 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by basamaryan
Browse files

UPSTREAM: net/tls: fix sk_msg trim on fallback to copy mode

sk_msg_trim() tries to only update curr pointer if it falls into
the trimmed region. The logic, however, does not take into the
account pointer wrapping that sk_msg_iter_var_prev() does nor
(as John points out) the fact that msg->sg is a ring buffer.

This means that when the message was trimmed completely, the new
curr pointer would have the value of MAX_MSG_FRAGS - 1, which is
neither smaller than any other value, nor would it actually be
correct.

Special case the trimming to 0 length a little bit and rework
the comparison between curr and end to take into account wrapping.

This bug caused the TLS code to not copy all of the message, if
zero copy filled in fewer sg entries than memcopy would need.

Big thanks to Alexander Potapenko for the non-KMSAN reproducer.

v2:
 - take into account that msg->sg is a ring buffer (John).

Link: https://lore.kernel.org/netdev/20191030160542.30295-1-jakub.kicinski@netronome.com/

 (v1)

Fixes: d829e9c4112b ("tls: convert to generic sk_msg interface")
Reported-by: default avatar <syzbot+f8495bff23a879a6d0bd@syzkaller.appspotmail.com>
Reported-by: default avatar <syzbot+6f50c99e8f6194bf363f@syzkaller.appspotmail.com>
Co-developed-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Change-Id: Ie79c921e9772e94fb9883c846d199d17c88a4bcb
Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 75af17a7
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment