Skip to content

Commit a4a53ba

Browse files
authored
Merge pull request #814 from zhaozihanzzh/dev-ldpreload
Fix cplen calculation error in ff_hook_getsockname
2 parents e0973d7 + d0c4ca9 commit a4a53ba

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

adapter/syscall/ff_hook_syscall.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ ff_hook_getsockname(int fd, struct sockaddr *name,
419419
SYSCALL(FF_SO_GETSOCKNAME, args);
420420

421421
if (ret == 0) {
422-
socklen_t cplen = *namelen ? *sh_namelen > *namelen
422+
socklen_t cplen = *sh_namelen > *namelen ? *namelen
423423
: *sh_namelen;
424424
rte_memcpy(name, sh_name, cplen);
425425
*namelen = *sh_namelen;
@@ -475,7 +475,7 @@ ff_hook_getpeername(int fd, struct sockaddr *name,
475475
SYSCALL(FF_SO_GETPEERNAME, args);
476476

477477
if (ret == 0) {
478-
socklen_t cplen = *namelen ? *sh_namelen > *namelen
478+
socklen_t cplen = *sh_namelen > *namelen ? *namelen
479479
: *sh_namelen;
480480
rte_memcpy(name, sh_name, cplen);
481481
*namelen = *sh_namelen;
@@ -794,7 +794,7 @@ ff_hook_recvfrom(int fd, void *buf, size_t len, int flags,
794794
if (ret >= 0) {
795795
rte_memcpy(buf, sh_buf, ret);
796796
if (from) {
797-
socklen_t cplen = *fromlen ? *sh_fromlen > *fromlen
797+
socklen_t cplen = *sh_fromlen > *fromlen ? *fromlen
798798
: *sh_fromlen;
799799
rte_memcpy(from, sh_from, cplen);
800800
*fromlen = *sh_fromlen;

0 commit comments

Comments
 (0)