rpm/openssh
SHA256
1
0
Fork 0
forked from pool/openssh
Code Pull Requests Activity
28b55ed663
openssh/openssh-6.6p1-seccomp_getuid.patch

30 lines
1000 B
Diff
Raw Normal View History

Accepting request 222710 from home:pcerny:factory - re-enabling the seccomp sandbox (allowing use of getuid the syscall) OBS-URL: https://build.opensuse.org/request/show/222710 OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=66
2014-02-18 14:04:57 +01:00
# HG changeset patch
Accepting request 231427 from home:pcerny:factory - curve25519 key exchange fix (-curve25519-6.6.1p1.patch) - patch re-ordering (-audit3-key_auth_usage-fips.patch, -audit4-kex_results-fips.patch) OBS-URL: https://build.opensuse.org/request/show/231427 OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=80
2014-04-25 15:11:58 +02:00
# Parent bde6f1a808f345e141a976ebc3e37903c81a09cb
Accepting request 222710 from home:pcerny:factory - re-enabling the seccomp sandbox (allowing use of getuid the syscall) OBS-URL: https://build.opensuse.org/request/show/222710 OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=66
2014-02-18 14:04:57 +01:00
add 'getuid' syscall to list of allowed ones to prevent the sanboxed thread
from being killed by the seccomp filter
Accepting request 230097 from home:pcerny:factory - Update of the underlying OpenSSH to 6.6p1 - update to 6.6p1 Security: * sshd(8): when using environment passing with a sshd_config(5) AcceptEnv pattern with a wildcard. OpenSSH prior to 6.6 could be tricked into accepting any enviornment variable that contains the characters before the wildcard character. Features since 6.5p1: * ssh(1), sshd(8): removal of the J-PAKE authentication code, which was experimental, never enabled and has been unmaintained for some time. * ssh(1): skip 'exec' clauses other clauses predicates failed to match while processing Match blocks. * ssh(1): if hostname canonicalisation is enabled and results in the destination hostname being changed, then re-parse ssh_config(5) files using the new destination hostname. This gives 'Host' and 'Match' directives that use the expanded hostname a chance to be applied. Bugfixes: * ssh(1): avoid spurious "getsockname failed: Bad file descriptor" in ssh -W. bz#2200, debian#738692 * sshd(8): allow the shutdown(2) syscall in seccomp-bpf and systrace sandbox modes, as it is reachable if the connection is terminated during the pre-auth phase. * ssh(1), sshd(8): fix unsigned overflow that in SSH protocol 1 bignum parsing. Minimum key length checks render this bug unexploitable to compromise SSH 1 sessions. * sshd_config(5): clarify behaviour of a keyword that appears in multiple matching Match blocks. bz#2184 OBS-URL: https://build.opensuse.org/request/show/230097 OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=76
2014-04-14 23:53:01 +02:00
diff --git a/openssh-6.6p1/sandbox-seccomp-filter.c b/openssh-6.6p1/sandbox-seccomp-filter.c
--- a/openssh-6.6p1/sandbox-seccomp-filter.c
+++ b/openssh-6.6p1/sandbox-seccomp-filter.c
- openssh-6.5p1-seccomp_getuid.patch: re-enabling the seccomp sandbox (allowing use of the getuid syscall) (bnc#864171) OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=68
2014-02-19 14:30:54 +01:00
@@ -85,16 +85,20 @@ static const struct sock_filter preauth_
Accepting request 222710 from home:pcerny:factory - re-enabling the seccomp sandbox (allowing use of getuid the syscall) OBS-URL: https://build.opensuse.org/request/show/222710 OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=66
2014-02-18 14:04:57 +01:00
offsetof(struct seccomp_data, arch)),
BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, SECCOMP_AUDIT_ARCH, 1, 0),
BPF_STMT(BPF_RET+BPF_K, SECCOMP_FILTER_FAIL),
/* Load the syscall number for checking. */
BPF_STMT(BPF_LD+BPF_W+BPF_ABS,
offsetof(struct seccomp_data, nr)),
SC_DENY(open, EACCES),
SC_ALLOW(getpid),
+ SC_ALLOW(getuid),
- openssh-6.5p1-seccomp_getuid.patch: re-enabling the seccomp sandbox (allowing use of the getuid syscall) (bnc#864171) OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=68
2014-02-19 14:30:54 +01:00
+#ifdef __NR_getuid32
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=67
2014-02-19 14:22:51 +01:00
+ SC_ALLOW(getuid32),
- openssh-6.5p1-seccomp_getuid.patch: re-enabling the seccomp sandbox (allowing use of the getuid syscall) (bnc#864171) OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=68
2014-02-19 14:30:54 +01:00
+#endif
Accepting request 222710 from home:pcerny:factory - re-enabling the seccomp sandbox (allowing use of getuid the syscall) OBS-URL: https://build.opensuse.org/request/show/222710 OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=66
2014-02-18 14:04:57 +01:00
SC_ALLOW(gettimeofday),
SC_ALLOW(clock_gettime),
#ifdef __NR_time /* not defined on EABI ARM */
SC_ALLOW(time),
#endif
SC_ALLOW(read),
SC_ALLOW(write),
SC_ALLOW(close),
Copy Permalink