Skip to content

Commit e90ef85

Browse files
melverDinh Nguyen
authored andcommitted
nios2: Implement _THIS_IP_ using inline asm
Both GCC [1] and Clang [2] consider the generic version of _THIS_IP_ to be broken: #define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; }) In particular, the address of a label is only expected to be used with a computed goto. While the generic version more or less works today, it is known to be brittle and may break with current and future optimizations. For example, Clang -O2 always returns 1 when this function is inlined: static inline unsigned long get_ip(void) { return ({ __label__ __here; __here: (unsigned long)&&__here; }); } Fix it by overriding _THIS_IP_ in <asm/linkage.h> (which is included by <linux/instruction_pointer.h>) using an architecture-specific inline asm version. Additionally, avoiding taking the address of a label prevents compilers from emitting spurious indirect branch targets (e.g. ENDBR or BTI) under control-flow integrity schemes. Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=120071 [1] Link: llvm/llvm-project#138272 [2] Signed-off-by: Marco Elver <elver@google.com> Reviewed-by: David Laight <david.laight.linux@gmail.com> Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
1 parent 7734b16 commit e90ef85

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

arch/nios2/include/asm/linkage.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,6 @@
1212
#define __ALIGN .align 4
1313
#define __ALIGN_STR ".align 4"
1414

15+
#define _THIS_IP_ ({ unsigned long __ip; asm volatile("nextpc %0" : "=r" (__ip)); __ip; })
16+
1517
#endif

0 commit comments

Comments
 (0)