On Mon, May 2, 2016 at 7:35 AM, <[email protected]> wrote: > From: Chen Gang <[email protected]> > > According to their comments and the kasan_depth's initialization, if > kasan_depth is zero, it means disable. So kasan_depth need consider > about the 0 overflow. > > Also remove useless comments for dummy kasan_slab_free(). > > Signed-off-by: Chen Gang <[email protected]> > --- > include/linux/kasan.h | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/include/linux/kasan.h b/include/linux/kasan.h > index 645c280..37fab04 100644 > --- a/include/linux/kasan.h > +++ b/include/linux/kasan.h > @@ -32,13 +32,15 @@ static inline void *kasan_mem_to_shadow(const void *addr) > /* Enable reporting bugs after kasan_disable_current() */ > static inline void kasan_enable_current(void) > { > - current->kasan_depth++; > + if (current->kasan_depth + 1) > + current->kasan_depth++; > } > > /* Disable reporting bugs for current task */ > static inline void kasan_disable_current(void) > { > - current->kasan_depth--; > + if (current->kasan_depth) > + current->kasan_depth--; > } > > void kasan_unpoison_shadow(const void *address, size_t size); > @@ -113,8 +115,6 @@ static inline void kasan_krealloc(const void *object, > size_t new_size, > > static inline void kasan_slab_alloc(struct kmem_cache *s, void *object, > gfp_t flags) {} > -/* kasan_slab_free() returns true if the object has been put into quarantine. > - */ > static inline bool kasan_slab_free(struct kmem_cache *s, void *object) > { > return false; > -- > 1.9.3 >
Acked-by: Alexander Potapenko <[email protected]> -- Alexander Potapenko Software Engineer Google Germany GmbH Erika-Mann-Straße, 33 80636 München Geschäftsführer: Matthew Scott Sucherman, Paul Terence Manicle Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg
