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

Merge "Implement __memset_chk as a copy & paste of __memcpy_chk." am: d26d3c0b5c

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2305394

Change-Id: Ia29bbd268c3e5eb558728baf73a901abb1edd416
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2022-11-16 23:51:03 +00:00 committed by Automerger Merge Worker
commit 265920e997
4 changed files with 52 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libc/Android.bp
View file

@ -782,7 +782,7 @@ cc_library_static {
arch: {
arm: {
cflags: [
"-DNO___MEMCPY_CHK",
"-DHAVE_ASSEMBLER___MEMCPY_CHK",
"-DRENAME___STRCAT_CHK",
"-DRENAME___STRCPY_CHK",
],
@ -809,9 +809,10 @@ cc_library_static {
],
},
arm64: {
cflags: ["-DNO___MEMCPY_CHK"],
cflags: ["-DHAVE_ASSEMBLER___MEMCPY_CHK"],
srcs: [
"arch-arm64/generic/bionic/__memcpy_chk.S",
"arch-arm64/generic/bionic/__memset_chk.S",
],
},
},

47
libc/arch-arm64/generic/bionic/__memset_chk.S Normal file
View file

@ -0,0 +1,47 @@
/*
* 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.
*/
#include <private/bionic_asm.h>
ENTRY(__memset_chk)
cmp x2, x3
// Direct b.ls memcpy may not have enough range
b.hi .L_memset_chk_fail
b memset
.L_memset_chk_fail:
// Preserve for accurate backtrace.
stp x29, x30, [sp, -16]!
.cfi_def_cfa_offset 16
.cfi_rel_offset x29, 0
.cfi_rel_offset x30, 8
bl __memset_chk_fail
END(__memset_chk)
NOTE_GNU_PROPERTY()

13
libc/arch-arm64/generic/bionic/memset.S
View file

@ -85,19 +85,6 @@
#define L(l) .L ## l
ENTRY(__memset_chk)
cmp count, dst
bls memset
// Preserve for accurate backtrace.
stp x29, x30, [sp, -16]!
.cfi_def_cfa_offset 16
.cfi_rel_offset x29, 0
.cfi_rel_offset x30, 8
bl __memset_chk_fail
END(__memset_chk)
ENTRY(memset)
dup v0.16B, valw

4
libc/bionic/fortify.cpp
View file

@ -489,14 +489,14 @@ extern "C" char* __STRCPY_CHK(char* dst, const char* src, size_t dst_len) {
return strcpy(dst, src);
}
#if !defined(NO___MEMCPY_CHK)
#if !defined(HAVE_ASSEMBLER___MEMCPY_CHK)
// Runtime implementation of __memcpy_chk (used directly by compiler, not in headers).
extern "C" void* __memcpy_chk(void* dst, const void* src, size_t count, size_t dst_len) {
__check_count("memcpy", "count", count);
__check_buffer_access("memcpy", "write into", count, dst_len);
return memcpy(dst, src, count);
}
#endif // NO___MEMCPY_CHK
#endif
// Runtime implementation of __mempcpy_chk (used directly by compiler, not in headers).
extern "C" void* __mempcpy_chk(void* dst, const void* src, size_t count, size_t dst_len) {