b83d6747fa
Our FORTIFY _chk functions' implementations were very repetitive and verbose but not very helpful. We'd also screwed up and put the SSIZE_MAX checks where they would never fire unless you actually had a buffer as large as half your address space, which probably doesn't happen very often. Factor out the duplication and take the opportunity to actually show details like how big the overrun buffer was, or by how much it was overrun. Also remove the obsolete FORTIFY event logging. Also remove the unused __libc_fatal_no_abort. This change doesn't improve the diagnostics from the optimized assembler implementations. Change-Id: I176a90701395404d50975b547a00bd2c654e1252
41 lines
1.8 KiB
C++
41 lines
1.8 KiB
C++
/*
|
|
* Copyright (C) 2012 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.
|
|
*/
|
|
|
|
#undef _FORTIFY_SOURCE
|
|
|
|
#include <string.h>
|
|
|
|
#include "private/bionic_fortify.h"
|
|
|
|
// Runtime implementation of __builtin____strcpy_chk (used directly by compiler, not in headers).
|
|
extern "C" char* __strcpy_chk(char* dst, const char* src, size_t dst_len) {
|
|
// TODO: optimize so we don't scan src twice.
|
|
size_t src_len = strlen(src) + 1;
|
|
__check_buffer_access("strcpy", "write into", src_len, dst_len);
|
|
return strcpy(dst, src);
|
|
}
|