OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

[msan] Fix srcaddr handling in recvfrom interceptor. 

Recvfrom may receive a 0 byte packet with a non-empty source address.
This commit is contained in:
Evgenii Stepanov 2020-03-12 17:26:56 -07:00
parent 4a792965de
commit 54d6c11a6c
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
View File

@ -6433,12 +6433,11 @@ INTERCEPTOR(SSIZE_T, recvfrom, int fd, void *buf, SIZE_T len, int flags,
if (srcaddr) srcaddr_sz = *addrlen; if (srcaddr) srcaddr_sz = *addrlen;
(void)srcaddr_sz; // prevent "set but not used" warning (void)srcaddr_sz; // prevent "set but not used" warning
SSIZE_T res = REAL(recvfrom)(fd, buf, len, flags, srcaddr, addrlen); SSIZE_T res = REAL(recvfrom)(fd, buf, len, flags, srcaddr, addrlen);
if (res > 0) { if (res > 0)
COMMON_INTERCEPTOR_WRITE_RANGE(ctx, buf, Min((SIZE_T)res, len)); COMMON_INTERCEPTOR_WRITE_RANGE(ctx, buf, Min((SIZE_T)res, len));
if (srcaddr) if (res >= 0 && srcaddr)
COMMON_INTERCEPTOR_INITIALIZE_RANGE(srcaddr, COMMON_INTERCEPTOR_INITIALIZE_RANGE(srcaddr,
Min((SIZE_T)*addrlen, srcaddr_sz)); Min((SIZE_T)*addrlen, srcaddr_sz));
}
return res; return res;
} }
#define INIT_RECV_RECVFROM \ #define INIT_RECV_RECVFROM \