History

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

Masami Hiramatsu committed 7 years ago

Commit 2d8d8fa1 parent 0c9f2372 files · +7 −2Browse files

Unified · Split

2 files
  1. arch/x86/include/asm/uaccess.h +3 −1
  2. include/linux/uaccess.h +4 −1
arch/x86/include/asm/uaccess.h+3−1
@@ -66,7 +66,9 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un · 65 unmodified lines
66})66})
67 67
68#ifdef CONFIG_DEBUG_ATOMIC_SLEEP68#ifdef CONFIG_DEBUG_ATOMIC_SLEEP
69# define WARN_ON_IN_IRQ() WARN_ON_ONCE(!in_task())69static inline bool pagefault_disabled(void);
70# define WARN_ON_IN_IRQ() \
71 WARN_ON_ONCE(!in_task() && !pagefault_disabled())
70#else72#else
71# define WARN_ON_IN_IRQ()73# define WARN_ON_IN_IRQ()
72#endif74#endif
include/linux/uaccess.h+4−1
@@ -203,7 +203,10 @@ static inline void pagefault_enable(void) · 202 unmodified lines
203/*203/*
204 * Is the pagefault handler disabled? If so, user access methods will not sleep.204 * Is the pagefault handler disabled? If so, user access methods will not sleep.
205 */205 */
206#define pagefault_disabled() (current->pagefault_disabled != 0)206static inline bool pagefault_disabled(void)
207{
208 return current->pagefault_disabled != 0;
209}
207 210
208/*211/*
209 * The pagefault handler is in general disabled by pagefault_disable() or212 * The pagefault handler is in general disabled by pagefault_disable() or

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t