Commit 16a34d56 authored Feb 03, 2017 by Ingo Molnar Committed by Paul Lawrence Dec 14, 2017

BACKPORT: kasan, sched/headers: Uninline kasan_enable/disable_current()



<linux/kasan.h> is a low level header that is included early
in affected kernel headers. But it includes <linux/sched.h>
which complicates the cleanup of sched.h dependencies.

But kasan.h has almost no need for sched.h: its only use of
scheduler functionality is in two inline functions which are
not used very frequently - so uninline kasan_enable_current()
and kasan_disable_current().

Also add a <linux/sched.h> dependency to a .c file that depended
on kasan.h including it.

This paves the way to remove the <linux/sched.h> include from kasan.h.

Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Bug: 64145065
(cherry-picked from af8601ad420f6afa6445c927ad9f36d9700d96d6)
Change-Id: I13fd2d3927f663d694ea0d5bf44f18e2c62ae013
Signed-off-by: Paul Lawrence <paullawrence@google.com>

parent c0e5ed2d

include/linux/kasan.h

+2 −8

Original line number	Diff line number	Diff line
		@@ -30,16 +30,10 @@ 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++;
		}
		extern void kasan_enable_current(void);

		/* Disable reporting bugs for current task */
		static inline void kasan_disable_current(void)
		{
		current->kasan_depth--;
		}
		extern void kasan_disable_current(void);

		void kasan_unpoison_shadow(const void *address, size_t size);

mm/kasan/kasan.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,16 @@
		#include "kasan.h"
		#include "../slab.h"

		void kasan_enable_current(void)
		{
		current->kasan_depth++;
		}

		void kasan_disable_current(void)
		{
		current->kasan_depth--;
		}

		/*
		* Poisons the shadow memory for 'size' bytes starting from 'addr'.
		* Memory addresses should be aligned to KASAN_SHADOW_SCALE_SIZE.