generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use alloc_size attribute on *alloc functions

Browse Source 
malloc and family were not declared with __attribute__((alloc_size)).
This was (sometimes) preventing FORTIFY_SOURCE related functions
from knowing the size of the buffer it's dealing with, inhibiting
FORTIFY_SOURCE protections.

Add __attribute__((alloc_size))

Information about the alloc_size attribute can be found
at http://gcc.gnu.org/onlinedocs/gcc/Function-Attributes.html

Change-Id: Ia2f0a445f0170a7325f69259b5e7fb35a9f14921
This commit is contained in:
Nick Kralevich
2013-10-02 14:14:40 -07:00
parent 4bbf3a8b55
commit b91791d71c
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libc/include/malloc.h
View File

@@ -27,16 +27,16 @@
__BEGIN_DECLS
extern void* malloc(size_t byte_count) __mallocfunc __wur;
extern void* calloc(size_t item_count, size_t item_size) __mallocfunc __wur;
extern void* realloc(void* p, size_t byte_count) __wur;
extern void* malloc(size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(1)));
extern void* calloc(size_t item_count, size_t item_size) __mallocfunc __wur __attribute__((alloc_size(1,2)));
extern void* realloc(void* p, size_t byte_count) __wur __attribute__((alloc_size(2)));
extern void free(void* p);
extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur;
extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(2)));
extern size_t malloc_usable_size(const void* p);
extern void* valloc(size_t byte_count) __mallocfunc __wur;
extern void* pvalloc(size_t byte_count) __mallocfunc __wur;
extern void* valloc(size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(1)));
extern void* pvalloc(size_t byte_count) __mallocfunc __wur __attribute__((alloc_size(1)));
#ifndef STRUCT_MALLINFO_DECLARED
#define STRUCT_MALLINFO_DECLARED 1