Skip to content

Commit 73ac798

Browse files
npigginmpe
authored andcommitted
powerpc: Fix inverted SET_FULL_REGS bitop
This bit operation was inverted and set the low bit rather than cleared it, breaking the ability to ptrace non-volatile GPRs after exec. Fix. Only affects 64e and 32-bit. Fixes: feb9df3 ("powerpc/64s: Always has full regs, so remove remnant checks") Cc: stable@vger.kernel.org # v5.8+ Signed-off-by: Nicholas Piggin <npiggin@gmail.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20210308085530.3191843-1-npiggin@gmail.com
1 parent 7aed41c commit 73ac798

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

arch/powerpc/include/asm/ptrace.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ static inline void regs_set_return_value(struct pt_regs *regs, unsigned long rc)
195195
#define TRAP_FLAGS_MASK 0x11
196196
#define TRAP(regs) ((regs)->trap & ~TRAP_FLAGS_MASK)
197197
#define FULL_REGS(regs) (((regs)->trap & 1) == 0)
198-
#define SET_FULL_REGS(regs) ((regs)->trap |= 1)
198+
#define SET_FULL_REGS(regs) ((regs)->trap &= ~1)
199199
#endif
200200
#define CHECK_FULL_REGS(regs) BUG_ON(!FULL_REGS(regs))
201201
#define NV_REG_POISON 0xdeadbeefdeadbeefUL
@@ -210,7 +210,7 @@ static inline void regs_set_return_value(struct pt_regs *regs, unsigned long rc)
210210
#define TRAP_FLAGS_MASK 0x1F
211211
#define TRAP(regs) ((regs)->trap & ~TRAP_FLAGS_MASK)
212212
#define FULL_REGS(regs) (((regs)->trap & 1) == 0)
213-
#define SET_FULL_REGS(regs) ((regs)->trap |= 1)
213+
#define SET_FULL_REGS(regs) ((regs)->trap &= ~1)
214214
#define IS_CRITICAL_EXC(regs) (((regs)->trap & 2) != 0)
215215
#define IS_MCHECK_EXC(regs) (((regs)->trap & 4) != 0)
216216
#define IS_DEBUG_EXC(regs) (((regs)->trap & 8) != 0)

0 commit comments

Comments
 (0)