Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86/uaccess: Allow access_ok() in irq context if pagefault_disabled

WARN_ON_IN_IRQ() assumes that the access_ok() and following
user memory access can sleep. But this assumption is not
always correct; when the pagefault is disabled, following
memory access will just returns -EFAULT and never sleep.

Add pagefault_disabled() check in WARN_ON_ONCE() so that
it can ignore the case we call it with disabling pagefault.
For this purpose, this modified pagefault_disabled() as
an inline function.

Link: http://lkml.kernel.org/r/155789868664.26965.7932665824135793317.stgit@devnote2

Acked-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

authored by

Masami Hiramatsu and committed by
Steven Rostedt (VMware)
2d8d8fac 0c9f2379

+7 -2
+3 -1
arch/x86/include/asm/uaccess.h
··· 66 66 }) 67 67 68 68 #ifdef CONFIG_DEBUG_ATOMIC_SLEEP 69 - # define WARN_ON_IN_IRQ() WARN_ON_ONCE(!in_task()) 69 + static inline bool pagefault_disabled(void); 70 + # define WARN_ON_IN_IRQ() \ 71 + WARN_ON_ONCE(!in_task() && !pagefault_disabled()) 70 72 #else 71 73 # define WARN_ON_IN_IRQ() 72 74 #endif
+4 -1
include/linux/uaccess.h
··· 203 203 /* 204 204 * Is the pagefault handler disabled? If so, user access methods will not sleep. 205 205 */ 206 - #define pagefault_disabled() (current->pagefault_disabled != 0) 206 + static inline bool pagefault_disabled(void) 207 + { 208 + return current->pagefault_disabled != 0; 209 + } 207 210 208 211 /* 209 212 * The pagefault handler is in general disabled by pagefault_disable() or