61e699a133
* A dlmalloc usage error shouldn't call abort(3) because we want to cause a SIGSEGV by writing the address dlmalloc didn't like to an address the kernel won't like, so that debuggerd will dump the memory around the address that upset dlmalloc. * Switch to the simpler FreeBSD/NetBSD style of registering stdio cleanup. Hopefully this will let us simplify more of the stdio implementation. * Clear the stdio cleanup handler before we abort because of a dlmalloc corruption error. This fixes the reported bug, where we'd hang inside dlmalloc because the stdio cleanup reentered dlmalloc. Bug: 9301265 Change-Id: Ief31b389455d6876e5a68f0f5429567d37277dbc
44 lines
1.8 KiB
C
44 lines
1.8 KiB
C
/*
|
|
* Copyright (C) 2012 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include "dlmalloc.h"
|
|
|
|
#include "private/libc_logging.h"
|
|
|
|
// Send dlmalloc errors to the log.
|
|
static void __bionic_heap_corruption_error(const char* function);
|
|
static void __bionic_heap_usage_error(const char* function, void* address);
|
|
#define PROCEED_ON_ERROR 0
|
|
#define CORRUPTION_ERROR_ACTION(m) __bionic_heap_corruption_error(__FUNCTION__)
|
|
#define USAGE_ERROR_ACTION(m,p) __bionic_heap_usage_error(__FUNCTION__, p)
|
|
|
|
// Ugly inclusion of C file so that bionic specific #defines configure dlmalloc.
|
|
#include "../upstream-dlmalloc/malloc.c"
|
|
|
|
extern void (*__cleanup)();
|
|
|
|
static void __bionic_heap_corruption_error(const char* function) {
|
|
__cleanup = NULL; // The heap is corrupt. We can forget trying to shut down stdio.
|
|
__libc_fatal("heap corruption detected by %s", function);
|
|
}
|
|
|
|
static void __bionic_heap_usage_error(const char* function, void* address) {
|
|
__libc_fatal_no_abort("invalid address or address of corrupt block %p passed to %s",
|
|
address, function);
|
|
// So that debuggerd gives us a memory dump around the specific address.
|
|
// TODO: improve the debuggerd protocol so we can tell it to dump an address when we abort.
|
|
*((int**) 0xdeadbaad) = (int*) address;
|
|
}
|