tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix recvfrom prototype.

Browse source 
http://pubs.opengroup.org/onlinepubs/9699919799/functions/recvfrom.html

Change-Id: Iba203c74045c88e53e28c2e0c8bc1f9ac63ce23e
This commit is contained in:
Elliott Hughes 2016-08-12 09:20:07 -07:00
parent 166f875eab
commit 8197aca7f2
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libc/bionic/fortify.cpp
View file

@ -217,8 +217,7 @@ ssize_t __readlink_chk(const char* path, char* buf, size_t size, size_t buf_size
}
ssize_t __recvfrom_chk(int socket, void* buf, size_t len, size_t buf_size,
int flags, const sockaddr* src_addr,
socklen_t* addrlen) {
int flags, sockaddr* src_addr, socklen_t* addrlen) {
__check_buffer_access("recvfrom", "write into", len, buf_size);
return recvfrom(socket, buf, len, flags, src_addr, addrlen);
}

8
libc/include/sys/socket.h
View file

@ -291,18 +291,18 @@ ssize_t send(int, const void*, size_t, int);
ssize_t recv(int, void*, size_t, int);
__socketcall ssize_t sendto(int, const void*, size_t, int, const struct sockaddr*, socklen_t);
__socketcall ssize_t recvfrom(int, void*, size_t, int, const struct sockaddr*, socklen_t*);
__socketcall ssize_t recvfrom(int, void*, size_t, int, struct sockaddr*, socklen_t*);
__errordecl(__recvfrom_error, "recvfrom called with size bigger than buffer");
ssize_t __recvfrom_chk(int, void*, size_t, size_t, int, const struct sockaddr*, socklen_t*)
ssize_t __recvfrom_chk(int, void*, size_t, size_t, int, struct sockaddr*, socklen_t*)
__INTRODUCED_IN(21);
ssize_t __recvfrom_real(int, void*, size_t, int, const struct sockaddr*, socklen_t*) __RENAME(recvfrom);
ssize_t __recvfrom_real(int, void*, size_t, int, struct sockaddr*, socklen_t*) __RENAME(recvfrom);
#if defined(__BIONIC_FORTIFY)
#if __ANDROID_API__ >= 24
__BIONIC_FORTIFY_INLINE
ssize_t recvfrom(int fd, void* buf, size_t len, int flags, const struct sockaddr* src_addr, socklen_t* addr_len) {
ssize_t recvfrom(int fd, void* buf, size_t len, int flags, struct sockaddr* src_addr, socklen_t* addr_len) {
size_t bos = __bos0(buf);
#if !defined(__clang__)