projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'Smack-for-5.11-io_uring-fix' of git://github.com/cschaufler/smack-next
[linux-2.6-microblaze.git]
/
mm
/
kasan
/
generic.c
diff --git
a/mm/kasan/generic.c
b/mm/kasan/generic.c
index
662212d
..
1dd5a0f
100644
(file)
--- a/
mm/kasan/generic.c
+++ b/
mm/kasan/generic.c
@@
-9,8
+9,6
@@
* Andrey Konovalov <andreyknvl@gmail.com>
*/
* Andrey Konovalov <andreyknvl@gmail.com>
*/
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
#include <linux/export.h>
#include <linux/interrupt.h>
#include <linux/init.h>
#include <linux/export.h>
#include <linux/interrupt.h>
#include <linux/init.h>
@@
-330,7
+328,7
@@
void kasan_record_aux_stack(void *addr)
{
struct page *page = kasan_addr_to_page(addr);
struct kmem_cache *cache;
{
struct page *page = kasan_addr_to_page(addr);
struct kmem_cache *cache;
- struct kasan_alloc_meta *alloc_
info
;
+ struct kasan_alloc_meta *alloc_
meta
;
void *object;
if (!(page && PageSlab(page)))
void *object;
if (!(page && PageSlab(page)))
@@
-338,10
+336,10
@@
void kasan_record_aux_stack(void *addr)
cache = page->slab_cache;
object = nearest_obj(cache, page, addr);
cache = page->slab_cache;
object = nearest_obj(cache, page, addr);
- alloc_
info = get_alloc_info
(cache, object);
+ alloc_
meta = kasan_get_alloc_meta
(cache, object);
- alloc_
info->aux_stack[1] = alloc_info
->aux_stack[0];
- alloc_
info
->aux_stack[0] = kasan_save_stack(GFP_NOWAIT);
+ alloc_
meta->aux_stack[1] = alloc_meta
->aux_stack[0];
+ alloc_
meta
->aux_stack[0] = kasan_save_stack(GFP_NOWAIT);
}
void kasan_set_free_info(struct kmem_cache *cache,
}
void kasan_set_free_info(struct kmem_cache *cache,
@@
-349,12
+347,12
@@
void kasan_set_free_info(struct kmem_cache *cache,
{
struct kasan_free_meta *free_meta;
{
struct kasan_free_meta *free_meta;
- free_meta = get_free_info(cache, object);
- kasan_set_track(&free_meta->free_track, GFP_NOWAIT);
+ free_meta = kasan_get_free_meta(cache, object);
+ if (!free_meta)
+ return;
- /*
- * the object was freed and has free track set
- */
+ kasan_set_track(&free_meta->free_track, GFP_NOWAIT);
+ /* The object was freed and has free track set. */
*(u8 *)kasan_mem_to_shadow(object) = KASAN_KMALLOC_FREETRACK;
}
*(u8 *)kasan_mem_to_shadow(object) = KASAN_KMALLOC_FREETRACK;
}
@@
-363,5
+361,6
@@
struct kasan_track *kasan_get_free_track(struct kmem_cache *cache,
{
if (*(u8 *)kasan_mem_to_shadow(object) != KASAN_KMALLOC_FREETRACK)
return NULL;
{
if (*(u8 *)kasan_mem_to_shadow(object) != KASAN_KMALLOC_FREETRACK)
return NULL;
- return &get_free_info(cache, object)->free_track;
+ /* Free meta must be present with KASAN_KMALLOC_FREETRACK. */
+ return &kasan_get_free_meta(cache, object)->free_track;
}
}