Skip to contentSkip to conversation

arm64: fix function types in COND_SYSCALL

PATCH In review Sami Tolvanen 3 participants 4 messages Sep 10, 2019 – Sep 13, 2019 arm64

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: fix function types in COND_SYSCALL

Define a weak function in COND_SYSCALL instead of a weak alias to sys_ni_syscall, which has an incompatible type. This fixes indirect call mismatches with Control-Flow Integrity (CFI) checking.

---
 arch/arm64/include/asm/syscall_wrapper.h | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
arch/arm64/include/asm/syscall_wrapper.h +12 -3
index 507d0ee6bc69..06d880b3526c 100644
@@ -8,6 +8,8 @@
 #ifndef __ASM_SYSCALL_WRAPPER_H
 #define __ASM_SYSCALL_WRAPPER_H
 
+struct pt_regs;
+
 #define SC_ARM64_REGS_TO_ARGS(x, ...)				\
 	__MAP(x,__SC_ARGS					\
 	      ,,regs->regs[0],,regs->regs[1],,regs->regs[2]	\
@@ -35,8 +37,11 @@
 	ALLOW_ERROR_INJECTION(__arm64_compat_sys_##sname, ERRNO);			\
 	asmlinkage long __arm64_compat_sys_##sname(const struct pt_regs *__unused)
 
-#define COND_SYSCALL_COMPAT(name) \
-	cond_syscall(__arm64_compat_sys_##name);
+#define COND_SYSCALL_COMPAT(name) 							\
+	asmlinkage long __weak __arm64_compat_sys_##name(const struct pt_regs *regs)	\
+	{										\
+		return sys_ni_syscall();						\
+	}
 
 #define COMPAT_SYS_NI(name) \
 	SYSCALL_ALIAS(__arm64_compat_sys_##name, sys_ni_posix_timers);
@@ -70,7 +75,11 @@
 #endif
 
 #ifndef COND_SYSCALL
-#define COND_SYSCALL(name) cond_syscall(__arm64_sys_##name)
+#define COND_SYSCALL(name)							\
+	asmlinkage long __weak __arm64_sys_##name(const struct pt_regs *regs)	\
+	{									\
+		return sys_ni_syscall();					\
+	}
 #endif
 
 #ifndef SYS_NI
Signature · 1 line
2.23.0.162.g0b9fbb3734-goog
reviewer Acked-by on v1 1/1
#1 lore raw
Quoted 5 lines · Sami Tolvanen

Define a weak function in COND_SYSCALL instead of a weak alias to sys_ni_syscall, which has an incompatible type. This fixes indirect call mismatches with Control-Flow Integrity (CFI) checking.

This looks correct to me, builds fine, and I asume has been tested, so FWIW:

In looking at this, I came to the conclusion that we can drop the ifdeffery around our SYSCALL_DEFINE0(), COND_SYSCALL(), and SYS_NI(), which I evidently cargo-culted from x86 (where the ifdeffery is actually necessary).

I can send a follow up for that.

Thanks,
Mark.

Quoted 47 lines
---
 arch/arm64/include/asm/syscall_wrapper.h | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
arch/arm64/include/asm/syscall_wrapper.h +12 -3
index 507d0ee6bc69..06d880b3526c 100644
@@ -8,6 +8,8 @@
 #ifndef __ASM_SYSCALL_WRAPPER_H
 #define __ASM_SYSCALL_WRAPPER_H
 
+struct pt_regs;
+
 #define SC_ARM64_REGS_TO_ARGS(x, ...)				\
 	__MAP(x,__SC_ARGS					\
 	      ,,regs->regs[0],,regs->regs[1],,regs->regs[2]	\
@@ -35,8 +37,11 @@
 	ALLOW_ERROR_INJECTION(__arm64_compat_sys_##sname, ERRNO);			\
 	asmlinkage long __arm64_compat_sys_##sname(const struct pt_regs *__unused)
 
-#define COND_SYSCALL_COMPAT(name) \
-	cond_syscall(__arm64_compat_sys_##name);
+#define COND_SYSCALL_COMPAT(name) 							\
+	asmlinkage long __weak __arm64_compat_sys_##name(const struct pt_regs *regs)	\
+	{										\
+		return sys_ni_syscall();						\
+	}
 
 #define COMPAT_SYS_NI(name) \
 	SYSCALL_ALIAS(__arm64_compat_sys_##name, sys_ni_posix_timers);
@@ -70,7 +75,11 @@
 #endif
 
 #ifndef COND_SYSCALL
-#define COND_SYSCALL(name) cond_syscall(__arm64_sys_##name)
+#define COND_SYSCALL(name)							\
+	asmlinkage long __weak __arm64_sys_##name(const struct pt_regs *regs)	\
+	{									\
+		return sys_ni_syscall();					\
+	}
 #endif
 
 #ifndef SYS_NI
Signature · 1 line
2.23.0.162.g0b9fbb3734-goog
maintainer
#2 lore raw
Quoted 7 lines · Mark Rutland
Quoted 5 lines · Sami Tolvanen

Define a weak function in COND_SYSCALL instead of a weak alias to sys_ni_syscall, which has an incompatible type. This fixes indirect call mismatches with Control-Flow Integrity (CFI) checking.

Quoted 7 lines

This looks correct to me, builds fine, and I asume has been tested, so FWIW:

In looking at this, I came to the conclusion that we can drop the ifdeffery around our SYSCALL_DEFINE0(), COND_SYSCALL(), and SYS_NI(), which I evidently cargo-culted from x86 (where the ifdeffery is actually necessary).

Curious: why is it required on x86?

Quoted 1 line

I can send a follow up for that.

Yes, please.

Will

reviewer
#3 lore raw
Quoted 10 lines · Will Deacon
Quoted 9 lines · Mark Rutland
Quoted 5 lines · Sami Tolvanen

Define a weak function in COND_SYSCALL instead of a weak alias to sys_ni_syscall, which has an incompatible type. This fixes indirect call mismatches with Control-Flow Integrity (CFI) checking.

This looks correct to me, builds fine, and I asume has been tested, so FWIW:

Quoted 7 lines
Quoted 5 lines

In looking at this, I came to the conclusion that we can drop the ifdeffery around our SYSCALL_DEFINE0(), COND_SYSCALL(), and SYS_NI(), which I evidently cargo-culted from x86 (where the ifdeffery is actually necessary).

Curious: why is it required on x86?

Due to the way they share some native calls with (IA32) compat, but need slightly different wrappers to marshall registers, they have ifdeffery like:

#ifdef CONFIG_IA32_EMULATION

#define COND_SYSCALL(name)                                              \
        cond_syscall(__x64_sys_##name);                                 \
        cond_syscall(__ia32_sys_##name)

#endif

#ifndef COND_SYSCALL
#define COND_SYSCALL(name) cond_syscall(__x64_sys_##name) #endif

... so that they define the compat wrapper when necessary, but not otherwise.

As we don't share the native syscall table with compat tasks, we don't need to do anything like that, and can unconditionally define the native case once.

Quoted 3 lines
Quoted 1 line

I can send a follow up for that.

Yes, please.

I'll cook that up now, atop of Sami's patch applied to arm64's for-next/core.

Thanks,
Mark.