Commit 893ef7db authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Zheng Zengkai
Browse files

tls: splice_read: fix accessing pre-processed records

mainline inclusion
from mainline-v5.16-rc3
commit e062fe99
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I56S5K?from=project-issue

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e062fe99cccd9ff9f232e593d163ecabd244fae8



--------------------------------

recvmsg() will put peek()ed and partially read records onto the rx_list.
splice_read() needs to consult that list otherwise it may miss data.
Align with recvmsg() and also put partially-read records onto rx_list.
tls_sw_advance_skb() is pretty pointless now and will be removed in
net-next.

Fixes: 692d7b5d ("tls: Fix recvmsg() to be able to peek across multiple records")
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>

Conflicts:
	net/tls/tls_sw.c

Signed-off-by: default avatarZiyang Xuan <william.xuanziyang@huawei.com>
Reviewed-by: default avatarWei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent f6e7d8ca
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment