sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

socket/recvfrom: Fix buffer copy direction when using BUILD_KERNEL.

Browse Source 
When using recvfrom, the data should be copied back to the user provided buffer after psock_recvfrom, not before.
This commit is contained in:
Stuart Ianna 2023-06-22 09:41:07 +10:00 committed by Xiang Xiao
parent f0a74eb492
commit 42abf22eef
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/socket/recvfrom.c
View File

@ -158,6 +158,7 @@ ssize_t recvfrom(int sockfd, FAR void *buf, size_t len, int flags,
struct sockaddr_storage kaddr;
FAR struct sockaddr *ufrom;
FAR void *kbuf;
FAR void *ubuf;
#endif
/* recvfrom() is a cancellation point */
@ -176,7 +177,7 @@ ssize_t recvfrom(int sockfd, FAR void *buf, size_t len, int flags,
goto errout_with_cancelpt;
}
memcpy(kbuf, buf, len);
ubuf = buf;
buf = kbuf;
/* Copy the address data to kernel, store the original user pointer */
@ -199,6 +200,7 @@ ssize_t recvfrom(int sockfd, FAR void *buf, size_t len, int flags,
}
#ifdef CONFIG_BUILD_KERNEL
memcpy(ubuf, buf, len);
kmm_free(kbuf);
/* Copy the address back to user */