Unverified Commit 715f2fee authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10555 skmsg: Skip zero length skb in sk_msg_recvmsg 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/JB5YY3TXLYRCKO3IU3BYX2HCCWMCWIS2/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAGEM4 
 
Link:https://gitee.com/openeuler/kernel/pulls/10555

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents a125f423 ae37c5ff

net/core/skmsg.c

+2 −1
Original line number Diff line number Diff line
@@ -434,6 +434,7 @@ int sk_msg_recvmsg(struct sock *sk, struct sk_psock *psock, struct msghdr *msg, 
			page = sg_page(sge);

			if (copied + copy > len)

				copy = len - copied;

			if (copy)

				copy = copy_page_to_iter(page, sge->offset, copy, iter);

			if (!copy) {

				copied = copied ? copied : -EFAULT;