summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-04 21:31:00 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-05 12:00:54 +0000
commitfa905948e573ceb97638070405a2d1a7b94ce6fe (patch)
tree2d02abe0f38073a5c1051fdec9a501b67092e141 /meta
parent03bf6b3ec0aaa24e9f81b3b0024c59f7cc77b410 (diff)
downloadpoky-fa905948e573ceb97638070405a2d1a7b94ce6fe.tar.gz
openssh: Backport a fix to fix with glibc 2.33 on some platforms
This fixes openssh failing to work on qemux86 with glibc 2.33 due to seccomp and the fact new syscalls are used. Also likely fixes issues on other platforms. (From OE-Core rev: 22f8ce6e6d998c0539a40b2776b1a2abb4f44bb3) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/openssh/openssh/0f90440ca70abab947acbd77795e9f130967956c.patch28
-rw-r--r--meta/recipes-connectivity/openssh/openssh_8.4p1.bb1
2 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/0f90440ca70abab947acbd77795e9f130967956c.patch b/meta/recipes-connectivity/openssh/openssh/0f90440ca70abab947acbd77795e9f130967956c.patch
new file mode 100644
index 0000000000..b88bc18f12
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh/0f90440ca70abab947acbd77795e9f130967956c.patch
@@ -0,0 +1,28 @@
1From 0f90440ca70abab947acbd77795e9f130967956c Mon Sep 17 00:00:00 2001
2From: Darren Tucker <dtucker@dtucker.net>
3Date: Fri, 20 Nov 2020 13:37:54 +1100
4Subject: [PATCH] Add new pselect6_time64 syscall on ARM.
5
6This is apparently needed on armhfp/armv7hl. bz#3232, patch from
7jjelen at redhat.com.
8---
9 sandbox-seccomp-filter.c | 3 +++
10 1 file changed, 3 insertions(+)
11
12Upstream-Status: Backport
13[fixes issues on 32bit IA and probably other 32 bit platforms too with glibc 2.33]
14
15diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
16index e0768c063..5065ae7ef 100644
17--- a/sandbox-seccomp-filter.c
18+++ b/sandbox-seccomp-filter.c
19@@ -267,6 +267,9 @@ static const struct sock_filter preauth_insns[] = {
20 #ifdef __NR_pselect6
21 SC_ALLOW(__NR_pselect6),
22 #endif
23+#ifdef __NR_pselect6_time64
24+ SC_ALLOW(__NR_pselect6_time64),
25+#endif
26 #ifdef __NR_read
27 SC_ALLOW(__NR_read),
28 #endif
diff --git a/meta/recipes-connectivity/openssh/openssh_8.4p1.bb b/meta/recipes-connectivity/openssh/openssh_8.4p1.bb
index 688fc8a024..128e2e318a 100644
--- a/meta/recipes-connectivity/openssh/openssh_8.4p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_8.4p1.bb
@@ -24,6 +24,7 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
24 file://fix-potential-signed-overflow-in-pointer-arithmatic.patch \ 24 file://fix-potential-signed-overflow-in-pointer-arithmatic.patch \
25 file://sshd_check_keys \ 25 file://sshd_check_keys \
26 file://add-test-support-for-busybox.patch \ 26 file://add-test-support-for-busybox.patch \
27 file://0f90440ca70abab947acbd77795e9f130967956c.patch \
27 " 28 "
28SRC_URI[sha256sum] = "5a01d22e407eb1c05ba8a8f7c654d388a13e9f226e4ed33bd38748dafa1d2b24" 29SRC_URI[sha256sum] = "5a01d22e407eb1c05ba8a8f7c654d388a13e9f226e4ed33bd38748dafa1d2b24"
29 30