Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 595bf2aa authored by Martin Schwidefsky's avatar Martin Schwidefsky Committed by Linus Torvalds
Browse files

[PATCH] s390: in_interrupt vs. in_atomic 



The condition for no context in do_exception checks for hard and soft
interrupts by using in_interrupt() but not for preemption.  This is bad for
the users of __copy_from/to_user_inatomic because the fault handler might call
schedule although the preemption count is != 0.  Use in_atomic() instead
in_interrupt().

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c5c3a6d8

arch/s390/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ do_exception(struct pt_regs *regs, unsigned long error_code, int is_protection) 
	 * we are not in an interrupt and that there is a 

	 * user context.

	 */

        if (user_address == 0 || in_interrupt() || !mm)

        if (user_address == 0 || in_atomic() || !mm)

                goto no_context;



	/*