diff options
Diffstat (limited to 'socket/bits/socket2.h')
| -rw-r--r-- | socket/bits/socket2.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/socket/bits/socket2.h b/socket/bits/socket2.h index 6238163e8c..a88c1545dd 100644 --- a/socket/bits/socket2.h +++ b/socket/bits/socket2.h @@ -21,18 +21,24 @@ # error "Never include <bits/socket2.h> directly; use <sys/socket.h> instead." #endif -extern void __chk_fail (void) __attribute__((__noreturn__)); +extern ssize_t __recv_chk (int __fd, void *__buf, size_t __n, size_t __buflen, + int __flags); extern ssize_t __REDIRECT (__recv_alias, (int __fd, void *__buf, size_t __n, int __flags), recv); extern __always_inline ssize_t recv (int __fd, void *__buf, size_t __n, int __flags) { - if (__bos0 (__buf) != (size_t) -1 && __n > __bos0 (__buf)) - __chk_fail (); + if (__bos0 (__buf) != (size_t) -1 + && (!__builtin_constant_p (__n) || __n > __bos0 (__buf))) + return __recv_chk (__fd, __buf, __n, __bos0 (__buf), __flags); return __recv_alias (__fd, __buf, __n, __flags); } +extern ssize_t __recvfrom_chk (int __fd, void *__restrict __buf, size_t __n, + size_t __buflen, int __flags, + __SOCKADDR_ARG __addr, + socklen_t *__restrict __addr_len); extern ssize_t __REDIRECT (__recvfrom_alias, (int __fd, void *__restrict __buf, size_t __n, int __flags, __SOCKADDR_ARG __addr, @@ -42,7 +48,9 @@ extern __always_inline ssize_t recvfrom (int __fd, void *__buf, size_t __n, int __flags, __SOCKADDR_ARG __addr, socklen_t *__restrict __addr_len) { - if (__bos0 (__buf) != (size_t) -1 && __n > __bos0 (__buf)) - __chk_fail (); + if (__bos0 (__buf) != (size_t) -1 + && (!__builtin_constant_p (__n) || __n > __bos0 (__buf))) + return __recvfrom_chk (__fd, __buf, __n, __bos0 (__buf), __flags, + __addr, __addr_len); return __recvfrom_alias (__fd, __buf, __n, __flags, __addr, __addr_len); } |