arm64: drop 3rd party audit warning patches n/a for 4.18.x

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

4 files changed, 0 insertions, 166 deletions

diff --git a/queue/arm64-fix-syscall_fn_t-type.patch b/queue/arm64-fix-syscall_fn_t-type.patch
deleted file mode 100644
index faecfd2..0000000
--- a/queue/arm64-fix-syscall_fn_t-type.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8ef8f368ce72b5e17f7c1f1ef15c38dcfd0fef64 Mon Sep 17 00:00:00 2001
-From: Sami Tolvanen <samitolvanen@google.com>
-Date: Fri, 24 May 2019 15:11:16 -0700
-Subject: [PATCH] arm64: fix syscall_fn_t type
-
-commit 8ef8f368ce72b5e17f7c1f1ef15c38dcfd0fef64 upstream.
-
-Syscall wrappers in <asm/syscall_wrapper.h> use const struct pt_regs *
-as the argument type. Use const in syscall_fn_t as well to fix indirect
-call type mismatches with Control-Flow Integrity checking.
-
-Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
-Reviewed-by: Mark Rutland <mark.rutland@arm.com>
-Signed-off-by: Will Deacon <will.deacon@arm.com>
-
-diff --git a/arch/arm64/include/asm/syscall.h b/arch/arm64/include/asm/syscall.h
-index a65167f5cded..e8bcb9ecede9 100644
---- a/arch/arm64/include/asm/syscall.h
-+++ b/arch/arm64/include/asm/syscall.h
-@@ -20,7 +20,7 @@
- #include <linux/compat.h>
- #include <linux/err.h>
- 
--typedef long (*syscall_fn_t)(struct pt_regs *regs);
-+typedef long (*syscall_fn_t)(const struct pt_regs *regs);
- 
- extern const syscall_fn_t sys_call_table[];
- 
--- 
-2.7.4
-
diff --git a/queue/arm64-use-the-correct-function-type-for-__arm64_sys_.patch b/queue/arm64-use-the-correct-function-type-for-__arm64_sys_.patch
deleted file mode 100644
index 4f28267..0000000
--- a/queue/arm64-use-the-correct-function-type-for-__arm64_sys_.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 1e29ab3186e33c77dbb2d7566172a205b59fa390 Mon Sep 17 00:00:00 2001
-From: Sami Tolvanen <samitolvanen@google.com>
-Date: Fri, 24 May 2019 15:11:18 -0700
-Subject: [PATCH] arm64: use the correct function type for
- __arm64_sys_ni_syscall
-
-commit 1e29ab3186e33c77dbb2d7566172a205b59fa390 upstream.
-
-Calling sys_ni_syscall through a syscall_fn_t pointer trips indirect
-call Control-Flow Integrity checking due to a function type
-mismatch. Use SYSCALL_DEFINE0 for __arm64_sys_ni_syscall instead and
-remove the now unnecessary casts.
-
-Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
-Signed-off-by: Will Deacon <will.deacon@arm.com>
-
-diff --git a/arch/arm64/kernel/sys.c b/arch/arm64/kernel/sys.c
-index 162a95ed0881..fe20c461582a 100644
---- a/arch/arm64/kernel/sys.c
-+++ b/arch/arm64/kernel/sys.c
-@@ -47,22 +47,26 @@ SYSCALL_DEFINE1(arm64_personality, unsigned int, personality)
- 	return ksys_personality(personality);
- }
- 
-+asmlinkage long sys_ni_syscall(void);
-+
-+asmlinkage long __arm64_sys_ni_syscall(const struct pt_regs *__unused)
-+{
-+	return sys_ni_syscall();
-+}
-+
- /*
-  * Wrappers to pass the pt_regs argument.
-  */
- #define __arm64_sys_personality		__arm64_sys_arm64_personality
- 
--asmlinkage long sys_ni_syscall(const struct pt_regs *);
--#define __arm64_sys_ni_syscall	sys_ni_syscall
--
- #undef __SYSCALL
- #define __SYSCALL(nr, sym)	asmlinkage long __arm64_##sym(const struct pt_regs *);
- #include <asm/unistd.h>
- 
- #undef __SYSCALL
--#define __SYSCALL(nr, sym)	[nr] = (syscall_fn_t)__arm64_##sym,
-+#define __SYSCALL(nr, sym)	[nr] = __arm64_##sym,
- 
- const syscall_fn_t sys_call_table[__NR_syscalls] = {
--	[0 ... __NR_syscalls - 1] = (syscall_fn_t)sys_ni_syscall,
-+	[0 ... __NR_syscalls - 1] = __arm64_sys_ni_syscall,
- #include <asm/unistd.h>
- };
-diff --git a/arch/arm64/kernel/sys32.c b/arch/arm64/kernel/sys32.c
-index 0f8bcb7de700..3c80a40c1c9d 100644
---- a/arch/arm64/kernel/sys32.c
-+++ b/arch/arm64/kernel/sys32.c
-@@ -133,17 +133,14 @@ COMPAT_SYSCALL_DEFINE6(aarch32_fallocate, int, fd, int, mode,
- 	return ksys_fallocate(fd, mode, arg_u64(offset), arg_u64(len));
- }
- 
--asmlinkage long sys_ni_syscall(const struct pt_regs *);
--#define __arm64_sys_ni_syscall	sys_ni_syscall
--
- #undef __SYSCALL
- #define __SYSCALL(nr, sym)	asmlinkage long __arm64_##sym(const struct pt_regs *);
- #include <asm/unistd32.h>
- 
- #undef __SYSCALL
--#define __SYSCALL(nr, sym)	[nr] = (syscall_fn_t)__arm64_##sym,
-+#define __SYSCALL(nr, sym)	[nr] = __arm64_##sym,
- 
- const syscall_fn_t compat_sys_call_table[__NR_compat_syscalls] = {
--	[0 ... __NR_compat_syscalls - 1] = (syscall_fn_t)sys_ni_syscall,
-+	[0 ... __NR_compat_syscalls - 1] = __arm64_sys_ni_syscall,
- #include <asm/unistd32.h>
- };
--- 
-2.7.4
-
diff --git a/queue/arm64-use-the-correct-function-type-in-SYSCALL_DEFIN.patch b/queue/arm64-use-the-correct-function-type-in-SYSCALL_DEFIN.patch
deleted file mode 100644
index 7204ec5..0000000
--- a/queue/arm64-use-the-correct-function-type-in-SYSCALL_DEFIN.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 0e358bd7b7ebd27e491dabed938eae254c17fe3b Mon Sep 17 00:00:00 2001
-From: Sami Tolvanen <samitolvanen@google.com>
-Date: Fri, 24 May 2019 15:11:17 -0700
-Subject: [PATCH] arm64: use the correct function type in SYSCALL_DEFINE0
-
-commit 0e358bd7b7ebd27e491dabed938eae254c17fe3b upstream.
-
-Although a syscall defined using SYSCALL_DEFINE0 doesn't accept
-parameters, use the correct function type to avoid indirect call
-type mismatches with Control-Flow Integrity checking.
-
-Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
-Signed-off-by: Will Deacon <will.deacon@arm.com>
-
-diff --git a/arch/arm64/include/asm/syscall_wrapper.h b/arch/arm64/include/asm/syscall_wrapper.h
-index a4477e515b79..507d0ee6bc69 100644
---- a/arch/arm64/include/asm/syscall_wrapper.h
-+++ b/arch/arm64/include/asm/syscall_wrapper.h
-@@ -30,10 +30,10 @@
- 	}										\
- 	static inline long __do_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))
- 
--#define COMPAT_SYSCALL_DEFINE0(sname)					\
--	asmlinkage long __arm64_compat_sys_##sname(void);		\
--	ALLOW_ERROR_INJECTION(__arm64_compat_sys_##sname, ERRNO);	\
--	asmlinkage long __arm64_compat_sys_##sname(void)
-+#define COMPAT_SYSCALL_DEFINE0(sname)							\
-+	asmlinkage long __arm64_compat_sys_##sname(const struct pt_regs *__unused);	\
-+	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);
-@@ -62,11 +62,11 @@
- 	static inline long __do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))
- 
- #ifndef SYSCALL_DEFINE0
--#define SYSCALL_DEFINE0(sname)					\
--	SYSCALL_METADATA(_##sname, 0);				\
--	asmlinkage long __arm64_sys_##sname(void);		\
--	ALLOW_ERROR_INJECTION(__arm64_sys_##sname, ERRNO);	\
--	asmlinkage long __arm64_sys_##sname(void)
-+#define SYSCALL_DEFINE0(sname)							\
-+	SYSCALL_METADATA(_##sname, 0);						\
-+	asmlinkage long __arm64_sys_##sname(const struct pt_regs *__unused);	\
-+	ALLOW_ERROR_INJECTION(__arm64_sys_##sname, ERRNO);			\
-+	asmlinkage long __arm64_sys_##sname(const struct pt_regs *__unused)
- #endif
- 
- #ifndef COND_SYSCALL
--- 
-2.7.4
-
diff --git a/queue/series b/queue/series
index 3d2d011..6271e37 100644
--- a/queue/series
+++ b/queue/series
@@ -214,9 +214,6 @@ xen-pvcalls-Remove-set-but-not-used-variable.patch
 xenbus-Avoid-deadlock-during-suspend-due-to-open-tra.patch
 KVM-PPC-Book3S-Use-new-mutex-to-synchronize-access-t.patch
 KVM-PPC-Book3S-HV-Don-t-take-kvm-lock-around-kvm_for.patch
-arm64-fix-syscall_fn_t-type.patch
-arm64-use-the-correct-function-type-in-SYSCALL_DEFIN.patch
-arm64-use-the-correct-function-type-for-__arm64_sys_.patch
 net-sh_eth-fix-mdio-access-in-sh_eth_close-for-R-Car.patch
 net-phylink-ensure-consistent-phy-interface-mode.patch
 net-phy-dp83867-Set-up-RGMII-TX-delay.patch