Skip to content

Commit 050e22b

Browse files
mrutland-armKAGA-KOKO
authored andcommitted
ARM: Snapshot thread flags
Some thread flags can be set remotely, and so even when IRQs are disabled, the flags can change under our feet. Generally this is unlikely to cause a problem in practice, but it is somewhat unsound, and KCSAN will legitimately warn that there is a data race. To avoid such issues, a snapshot of the flags has to be taken prior to using them. Some places already use READ_ONCE() for that, others do not. Convert them all to the new flag accessor helpers. Signed-off-by: Mark Rutland <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Acked-by: Paul E. McKenney <[email protected]> Cc: Russell King <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 7fb2b24 commit 050e22b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

arch/arm/kernel/signal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
631631
}
632632
}
633633
local_irq_disable();
634-
thread_flags = current_thread_info()->flags;
634+
thread_flags = read_thread_flags();
635635
} while (thread_flags & _TIF_WORK_MASK);
636636
return 0;
637637
}

arch/arm/mm/alignment.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,7 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
990990
* there is no work pending for this thread.
991991
*/
992992
raw_local_irq_disable();
993-
if (!(current_thread_info()->flags & _TIF_WORK_MASK))
993+
if (!(read_thread_flags() & _TIF_WORK_MASK))
994994
set_cr(cr_no_alignment);
995995
}
996996

0 commit comments

Comments
 (0)