vishalmishra434 / rpms / openssh

Forked from rpms/openssh a month ago
Clone
Jakub Jelen 535d34
diff -up openssh/configure.ac.seccomp openssh/configure.ac
Jakub Jelen 535d34
diff -up openssh/sandbox-seccomp-filter.c.seccomp openssh/sandbox-seccomp-filter.c
Jakub Jelen 535d34
--- openssh/sandbox-seccomp-filter.c.seccomp	2015-06-24 11:45:44.001581471 +0200
Jakub Jelen 535d34
+++ openssh/sandbox-seccomp-filter.c	2015-06-24 11:51:54.032635297 +0200
Jakub Jelen 535d34
@@ -165,6 +165,9 @@ static const struct sock_filter preauth_
665648
 #ifdef __NR__newselect
665648
 	SC_ALLOW(_newselect),
665648
 #endif
Jakub Jelen 68fa4f
+#ifdef __NR_pselect6 /* AArch64 */
Jakub Jelen bc083e
+	SC_ALLOW(pselect6),
Jakub Jelen bc083e
+#endif
Jakub Jelen 535d34
 #ifdef __NR_poll
Jakub Jelen 535d34
 	SC_ALLOW(poll),
Jakub Jelen 252221
 #endif
Jakub Jelen 58ba50
diff --git a/configure.ac b/configure.ac
Jakub Jelen 58ba50
index 24378a7..0bed910 100644
Jakub Jelen 58ba50
--- a/configure.ac
Jakub Jelen 58ba50
+++ b/configure.ac
Jakub Jelen 58ba50
@@ -811,6 +811,12 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
Jakub Jelen 58ba50
 	aarch64*-*)
Jakub Jelen 58ba50
 		seccomp_audit_arch=AUDIT_ARCH_AARCH64
Jakub Jelen 58ba50
 		;;
Jakub Jelen a4d9cd
+	s390x-*)
Jakub Jelen a4d9cd
+		seccomp_audit_arch=AUDIT_ARCH_S390X
Jakub Jelen a4d9cd
+		;;
Jakub Jelen a4d9cd
+	s390-*)
Jakub Jelen a4d9cd
+		seccomp_audit_arch=AUDIT_ARCH_S390
Jakub Jelen a4d9cd
+		;;
Jakub Jelen 58ba50
 	esac
Jakub Jelen 58ba50
 	if test "x$seccomp_audit_arch" != "x" ; then
Jakub Jelen 58ba50
 		AC_MSG_RESULT(["$seccomp_audit_arch"])
Jakub Jelen 58ba50