Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 17:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

skmsg: Return copied bytes in sk_msg_memcopy_from_iter

Browse Source 
Previously sk_msg_memcopy_from_iter returns the copied bytes from the
last copy_from_iter{,_nocache} call upon success.

This commit changes it to return the total number of copied bytes on
success.

Signed-off-by: Levi Zim <rsworktech@outlook.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Tested-by: Björn Töpel <bjorn@kernel.org>
Reviewed-by: John Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/bpf/20241130-tcp-bpf-sendmsg-v1-1-bae583d014f3@outlook.com
This commit is contained in:
Levi Zim 2024-11-30 21:38:22 +08:00 committed by Daniel Borkmann
parent d888b7af7c
commit fdf478d236
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/core/skmsg.c
View File

@ -369,8 +369,8 @@ int sk_msg_memcopy_from_iter(struct sock *sk, struct iov_iter *from,
struct sk_msg *msg, u32 bytes) struct sk_msg *msg, u32 bytes)
{ {
int ret = -ENOSPC, i = msg->sg.curr; int ret = -ENOSPC, i = msg->sg.curr;
u32 copy, buf_size, copied = 0;
struct scatterlist *sge; struct scatterlist *sge;
u32 copy, buf_size;
void *to; void *to;
do { do {
@ -397,6 +397,7 @@ int sk_msg_memcopy_from_iter(struct sock *sk, struct iov_iter *from,
goto out; goto out;
} }
bytes -= copy; bytes -= copy;
copied += copy;
if (!bytes) if (!bytes)
break; break;
msg->sg.copybreak = 0; msg->sg.copybreak = 0;
@ -404,7 +405,7 @@ int sk_msg_memcopy_from_iter(struct sock *sk, struct iov_iter *from,
} while (i != msg->sg.end); } while (i != msg->sg.end);
out: out:
msg->sg.curr = i; msg->sg.curr = i;
return ret; return (ret < 0) ? ret : copied;
} }
EXPORT_SYMBOL_GPL(sk_msg_memcopy_from_iter); EXPORT_SYMBOL_GPL(sk_msg_memcopy_from_iter);