mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
kasan: don't use __builtin_return_address(1)
__builtin_return_address(1) is unreliable without frame pointers. With defconfig on kmalloc_pagealloc_invalid_free test I am getting: BUG: KASAN: double-free or invalid-free in (null) Pass caller PC from callers explicitly. Link: http://lkml.kernel.org/r/9b01bc2d237a4df74ff8472a3bf6b7635908de01.1514378558.git.dvyukov@google.com Signed-off-by: Dmitry Vyukov <[email protected]> Cc: Andrey Ryabinin <[email protected]>a Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
47adccce3e
commit
ee3ce779b5
6 changed files with 19 additions and 18 deletions
|
|
@ -1356,13 +1356,13 @@ static inline void kmalloc_large_node_hook(void *ptr, size_t size, gfp_t flags)
|
|||
kasan_kmalloc_large(ptr, size, flags);
|
||||
}
|
||||
|
||||
static inline void kfree_hook(void *x)
|
||||
static __always_inline void kfree_hook(void *x)
|
||||
{
|
||||
kmemleak_free(x);
|
||||
kasan_kfree_large(x);
|
||||
kasan_kfree_large(x, _RET_IP_);
|
||||
}
|
||||
|
||||
static inline void *slab_free_hook(struct kmem_cache *s, void *x)
|
||||
static __always_inline void *slab_free_hook(struct kmem_cache *s, void *x)
|
||||
{
|
||||
void *freeptr;
|
||||
|
||||
|
|
@ -1390,7 +1390,7 @@ static inline void *slab_free_hook(struct kmem_cache *s, void *x)
|
|||
* kasan_slab_free() may put x into memory quarantine, delaying its
|
||||
* reuse. In this case the object's freelist pointer is changed.
|
||||
*/
|
||||
kasan_slab_free(s, x);
|
||||
kasan_slab_free(s, x, _RET_IP_);
|
||||
return freeptr;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue