forked from pool/openssh
37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
|
# HG changeset patch
|
||
|
|
# Parent a7b18fdd68dba10349e59a9085fd822343311f45
|
||
|
|
Patch from IBM enabling use of EP11 hw crypto accelerator, submitted upstreams:
|
||
|
|
|
||
|
|
From: Eduardo Barretto <ebarretto@linux.vnet.ibm.com>
|
||
|
|
To: openssh-unix-dev@mindrot.org
|
||
|
|
Subject: [PATCH 3/3] Enable specific ioctl call for EP11 crypto card (s390)
|
||
|
|
Date: Tue, 9 May 2017 14:27:15 -0300
|
||
|
|
|
||
|
|
The EP11 crypto card needs to make an ioctl call, which receives an
|
||
|
|
specific argument. This crypto card is for s390 only.
|
||
|
|
|
||
|
|
Signed-off-by: Eduardo Barretto <ebarretto@linux.vnet.ibm.com>
|
||
|
|
|
||
|
|
diff --git a/openssh-7.7p1/sandbox-seccomp-filter.c b/openssh-7.7p1/sandbox-seccomp-filter.c
|
||
|
|
--- openssh-7.7p1/sandbox-seccomp-filter.c
|
||
|
|
+++ openssh-7.7p1/sandbox-seccomp-filter.c
|
||
|
|
@@ -248,16 +248,18 @@ static const struct sock_filter preauth_
|
||
|
|
SC_ALLOW_ARG(__NR_socketcall, 0, SYS_SHUTDOWN),
|
||
|
|
SC_DENY(__NR_socketcall, EACCES),
|
||
|
|
#endif
|
||
|
|
#if defined(__NR_ioctl) && defined(__s390__)
|
||
|
|
/* Allow ioctls for ICA crypto card on s390 */
|
||
|
|
SC_ALLOW_ARG(__NR_ioctl, 1, Z90STAT_STATUS_MASK),
|
||
|
|
SC_ALLOW_ARG(__NR_ioctl, 1, ICARSAMODEXPO),
|
||
|
|
SC_ALLOW_ARG(__NR_ioctl, 1, ICARSACRT),
|
||
|
|
+ /* Allow ioctls for EP11 crypto card on s390 */
|
||
|
|
+ SC_ALLOW_ARG(__NR_ioctl, 1, ZSENDEP11CPRB),
|
||
|
|
#endif
|
||
|
|
#if defined(__x86_64__) && defined(__ILP32__) && defined(__X32_SYSCALL_BIT)
|
||
|
|
/*
|
||
|
|
* On Linux x32, the clock_gettime VDSO falls back to the
|
||
|
|
* x86-64 syscall under some circumstances, e.g.
|
||
|
|
* https://bugs.debian.org/849923
|
||
|
|
*/
|
||
|
|
SC_ALLOW(__NR_clock_gettime & ~__X32_SYSCALL_BIT),
|