Skip to contentSkip to conversation

sh: Fix clearing of thread info fault code

PATCH New Michael Büsch 1 participant 1 message Jun 18, 2015 SuperH

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sh: Fix clearing of thread info fault code

The expression (~0 >> x) will always yield all-ones, because the right shift is an arithmetic right shift that will always shift ones in. Hence the old fault code bits will not be cleared before being ORed with the new fault code.

Fix this by forcing a logical right shift instead of an arithmetic right shift by using an unsigned long constant.

---

The code also assumes sizeof(ti->flags) == 4. But that probably is ok for this arch.

This patch is untested, because I do not have the hardware.

arch/sh/include/asm/thread_info.h +1 -1
Index: linux/arch/sh/include/asm/thread_info.h
===================================================================
@@ -172,7 +172,7 @@ static inline void set_restore_sigmask(v
 static inline void set_thread_fault_code(unsigned int val)
 {
 	struct thread_info *ti = current_thread_info();
-	ti->flags = (ti->flags & (~0 >> (32 - TI_FLAG_FAULT_CODE_SHIFT)))
+	ti->flags = (ti->flags & (~0UL >> (32 - TI_FLAG_FAULT_CODE_SHIFT)))
 		| (val << TI_FLAG_FAULT_CODE_SHIFT);
 }