d98dac41df
This commit fixes an error in fortified `sendto` function. Since
`__sendto_chk` is only introduced in API 26, the usage should be guarded
with `__ANDROID__API__ >= 26` instead of
`__ANDROID_API__ >= __ANDROID_API_N_MR1__` (25).
Bug: 118991081
Test: source development/vndk/tools/header-checker/android/envsetup.sh && \
source build/envsetup.sh && \
lunch aosp_arm64-userdebug && \
m versioner && \
./bionic/tools/versioner/run_tests.py
Change-Id: Ibc08244645c3fe76a72d0107138f67ffd56f5caa
86 lines
3.6 KiB
C
86 lines
3.6 KiB
C
/*
|
|
* Copyright (C) 2017 The Android Open Source Project
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
|
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
|
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
|
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
|
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
|
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef _SYS_SOCKET_H_
|
|
#error "Never include this file directly; instead, include <sys/socket.h>"
|
|
#endif
|
|
|
|
extern ssize_t __sendto_chk(int, const void*, size_t, size_t, int, const struct sockaddr*,
|
|
socklen_t) __INTRODUCED_IN(26);
|
|
ssize_t __recvfrom_chk(int, void*, size_t, size_t, int, struct sockaddr*,
|
|
socklen_t*) __INTRODUCED_IN(21);
|
|
|
|
#if defined(__BIONIC_FORTIFY)
|
|
|
|
__BIONIC_FORTIFY_INLINE
|
|
ssize_t recvfrom(int fd, void* const buf __pass_object_size0, size_t len, int flags, struct sockaddr* src_addr, socklen_t* addr_len)
|
|
__overloadable
|
|
__clang_error_if(__bos_unevaluated_lt(__bos0(buf), len),
|
|
"'recvfrom' called with size bigger than buffer") {
|
|
#if __ANDROID_API__ >= 24 && __BIONIC_FORTIFY_RUNTIME_CHECKS_ENABLED
|
|
size_t bos = __bos0(buf);
|
|
|
|
if (!__bos_trivially_ge(bos, len)) {
|
|
return __recvfrom_chk(fd, buf, len, bos, flags, src_addr, addr_len);
|
|
}
|
|
#endif
|
|
return __call_bypassing_fortify(recvfrom)(fd, buf, len, flags, src_addr, addr_len);
|
|
}
|
|
|
|
__BIONIC_FORTIFY_INLINE
|
|
ssize_t sendto(int fd, const void* const buf __pass_object_size0, size_t len, int flags, const struct sockaddr* dest_addr, socklen_t addr_len)
|
|
__overloadable
|
|
__clang_error_if(__bos_unevaluated_lt(__bos0(buf), len),
|
|
"'sendto' called with size bigger than buffer") {
|
|
#if __ANDROID_API__ >= 26 && __BIONIC_FORTIFY_RUNTIME_CHECKS_ENABLED
|
|
size_t bos = __bos0(buf);
|
|
|
|
if (!__bos_trivially_ge(bos, len)) {
|
|
return __sendto_chk(fd, buf, len, bos, flags, dest_addr, addr_len);
|
|
}
|
|
#endif
|
|
return __call_bypassing_fortify(sendto)(fd, buf, len, flags, dest_addr, addr_len);
|
|
}
|
|
|
|
__BIONIC_FORTIFY_INLINE
|
|
ssize_t recv(int socket, void* const buf __pass_object_size0, size_t len, int flags)
|
|
__overloadable
|
|
__clang_error_if(__bos_unevaluated_lt(__bos0(buf), len),
|
|
"'recv' called with size bigger than buffer") {
|
|
return recvfrom(socket, buf, len, flags, NULL, 0);
|
|
}
|
|
|
|
__BIONIC_FORTIFY_INLINE
|
|
ssize_t send(int socket, const void* const buf __pass_object_size0, size_t len, int flags)
|
|
__overloadable
|
|
__clang_error_if(__bos_unevaluated_lt(__bos0(buf), len),
|
|
"'send' called with size bigger than buffer") {
|
|
return sendto(socket, buf, len, flags, NULL, 0);
|
|
}
|
|
|
|
#endif /* __BIONIC_FORTIFY */
|