Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

UPSTREAM: kasan: add __must_check annotations to kasan hooks

Browse source 
(Upstream commit 66afc7f1e07a1db74453be9167ac0d1205653854).

This patch adds __must_check annotations to kasan hooks that return a
pointer to make sure that a tagged pointer always gets propagated.

Link: http://lkml.kernel.org/r/03b269c5e453945f724bfca3159d4e1333a8fb1c.1544099024.git.andreyknvl@google.com
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Suggested-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Bug: 128674696
Change-Id: I758f33506b67ed5d4b7539745db311ab31c37f46
This commit is contained in:
Andrey Konovalov 2018-12-28 00:31:01 -08:00 committed by Alistair Delva
parent be21fa3044
commit c80e94ddfc
2 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
include/linux/kasan.h
View file

@ -49,16 +49,20 @@ void kasan_cache_create(struct kmem_cache *cache, unsigned int *size,
void kasan_poison_slab(struct page *page); void kasan_poison_slab(struct page *page);
void kasan_unpoison_object_data(struct kmem_cache *cache, void *object); void kasan_unpoison_object_data(struct kmem_cache *cache, void *object);
void kasan_poison_object_data(struct kmem_cache *cache, void *object); void kasan_poison_object_data(struct kmem_cache *cache, void *object);
void *kasan_init_slab_obj(struct kmem_cache *cache, const void *object); void * __must_check kasan_init_slab_obj(struct kmem_cache *cache,
const void *object);
void *kasan_kmalloc_large(const void *ptr, size_t size, gfp_t flags); void * __must_check kasan_kmalloc_large(const void *ptr, size_t size,
gfp_t flags);
void kasan_kfree_large(void *ptr, unsigned long ip); void kasan_kfree_large(void *ptr, unsigned long ip);
void kasan_poison_kfree(void *ptr, unsigned long ip); void kasan_poison_kfree(void *ptr, unsigned long ip);
void *kasan_kmalloc(struct kmem_cache *s, const void *object, size_t size, void * __must_check kasan_kmalloc(struct kmem_cache *s, const void *object,
gfp_t flags); size_t size, gfp_t flags);
void *kasan_krealloc(const void *object, size_t new_size, gfp_t flags); void * __must_check kasan_krealloc(const void *object, size_t new_size,
gfp_t flags);
void *kasan_slab_alloc(struct kmem_cache *s, void *object, gfp_t flags); void * __must_check kasan_slab_alloc(struct kmem_cache *s, void *object,
gfp_t flags);
bool kasan_slab_free(struct kmem_cache *s, void *object, unsigned long ip); bool kasan_slab_free(struct kmem_cache *s, void *object, unsigned long ip);
struct kasan_cache { struct kasan_cache {

15
mm/kasan/common.c
View file

@ -373,7 +373,8 @@ static u8 assign_tag(struct kmem_cache *cache, const void *object, bool new)
#endif #endif
} }
void *kasan_init_slab_obj(struct kmem_cache *cache, const void *object) void * __must_check kasan_init_slab_obj(struct kmem_cache *cache,
const void *object)
{ {
struct kasan_alloc_meta *alloc_info; struct kasan_alloc_meta *alloc_info;
@ -389,7 +390,8 @@ void *kasan_init_slab_obj(struct kmem_cache *cache, const void *object)
return (void *)object; return (void *)object;
} }
void *kasan_slab_alloc(struct kmem_cache *cache, void *object, gfp_t flags) void * __must_check kasan_slab_alloc(struct kmem_cache *cache, void *object,
gfp_t flags)
{ {
return kasan_kmalloc(cache, object, cache->object_size, flags); return kasan_kmalloc(cache, object, cache->object_size, flags);
} }
@ -449,8 +451,8 @@ bool kasan_slab_free(struct kmem_cache *cache, void *object, unsigned long ip)
return __kasan_slab_free(cache, object, ip, true); return __kasan_slab_free(cache, object, ip, true);
} }
void *kasan_kmalloc(struct kmem_cache *cache, const void *object, size_t size, void * __must_check kasan_kmalloc(struct kmem_cache *cache, const void *object,
gfp_t flags) size_t size, gfp_t flags)
{ {
unsigned long redzone_start; unsigned long redzone_start;
unsigned long redzone_end; unsigned long redzone_end;
@ -482,7 +484,8 @@ void *kasan_kmalloc(struct kmem_cache *cache, const void *object, size_t size,
} }
EXPORT_SYMBOL(kasan_kmalloc); EXPORT_SYMBOL(kasan_kmalloc);
void *kasan_kmalloc_large(const void *ptr, size_t size, gfp_t flags) void * __must_check kasan_kmalloc_large(const void *ptr, size_t size,
gfp_t flags)
{ {
struct page *page; struct page *page;
unsigned long redzone_start; unsigned long redzone_start;
@ -506,7 +509,7 @@ void *kasan_kmalloc_large(const void *ptr, size_t size, gfp_t flags)
return (void *)ptr; return (void *)ptr;
} }
void *kasan_krealloc(const void *object, size_t size, gfp_t flags) void * __must_check kasan_krealloc(const void *object, size_t size, gfp_t flags)
{ {
struct page *page; struct page *page;