Antonio Larrosa
da2c6cc517
* No changes for askpass, see main package changelog for details. - Fix a dbus connection leaked in the logind patch that was missing a sd_bus_unref call (found by Matthias Gerstner): * logind_set_tty.patch - Add a patch that fixes a small memory leak when parsing the subsystem configuration option: * fix-memleak-in-process_server_config_line_depth.patch - Update to openssh 9.8p1: = Security * 1) Race condition in sshd(8) (bsc#1226642, CVE-2024-6387). A critical vulnerability in sshd(8) was present in Portable OpenSSH versions between 8.5p1 and 9.7p1 (inclusive) that may allow arbitrary code execution with root privileges. Successful exploitation has been demonstrated on 32-bit Linux/glibc systems with ASLR. Under lab conditions, the attack requires on average 6-8 hours of continuous connections up to the maximum the server will accept. Exploitation on 64-bit systems is believed to be possible but has not been demonstrated at this time. It's likely that these attacks will be improved upon. Exploitation on non-glibc systems is conceivable but has not been examined. Systems that lack ASLR or users of downstream Linux distributions that have modified OpenSSH to disable per-connection ASLR re-randomisation (yes - this is a thing, no - we don't understand why) may potentially have an easier path to exploitation. OpenBSD is not vulnerable. OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=272
56 lines
2.1 KiB
Diff
56 lines
2.1 KiB
Diff
From 66aaa678dbe59aa21d0d9d89a3596ecedde0254b Mon Sep 17 00:00:00 2001
|
|
From: "djm@openbsd.org" <djm@openbsd.org>
|
|
Date: Tue, 30 Apr 2024 02:14:10 +0000
|
|
Subject: [PATCH] upstream: correctly restore sigprocmask around ppoll()
|
|
reported
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
by Tõivo Leedjärv; ok deraadt@
|
|
|
|
OpenBSD-Commit-ID: c0c0f89de5294a166578f071eade2501929c4686
|
|
---
|
|
clientloop.c | 4 ++--
|
|
serverloop.c | 4 ++--
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/clientloop.c b/clientloop.c
|
|
index be8bb5fc1f2..8ea2ada4216 100644
|
|
--- a/clientloop.c
|
|
+++ b/clientloop.c
|
|
#@@ -1,4 +1,4 @@
|
|
#-/* $OpenBSD: clientloop.c,v 1.404 2024/04/30 02:10:49 djm Exp $ */
|
|
#+/* $OpenBSD: clientloop.c,v 1.405 2024/04/30 02:14:10 djm Exp $ */
|
|
# /*
|
|
# * Author: Tatu Ylonen <ylo@cs.hut.fi>
|
|
# * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
|
@@ -1585,7 +1585,7 @@ client_loop(struct ssh *ssh, int have_pty, int escape_char_arg,
|
|
client_wait_until_can_do_something(ssh, &pfd, &npfd_alloc,
|
|
&npfd_active, channel_did_enqueue, &osigset,
|
|
&conn_in_ready, &conn_out_ready);
|
|
- if (sigprocmask(SIG_UNBLOCK, &bsigset, &osigset) == -1)
|
|
+ if (sigprocmask(SIG_SETMASK, &osigset, NULL) == -1)
|
|
error_f("osigset sigprocmask: %s", strerror(errno));
|
|
|
|
if (quit_pending)
|
|
diff --git a/serverloop.c b/serverloop.c
|
|
index f3683c2e4a6..94c8943a616 100644
|
|
--- a/serverloop.c
|
|
+++ b/serverloop.c
|
|
@@ -1,4 +1,4 @@
|
|
-/* $OpenBSD: serverloop.c,v 1.237 2023/08/21 04:59:54 djm Exp $ */
|
|
+/* $OpenBSD: serverloop.c,v 1.238 2024/04/30 02:14:10 djm Exp $ */
|
|
/*
|
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
|
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
|
@@ -380,7 +380,7 @@ server_loop2(struct ssh *ssh, Authctxt *authctxt)
|
|
wait_until_can_do_something(ssh, connection_in, connection_out,
|
|
&pfd, &npfd_alloc, &npfd_active, &osigset,
|
|
&conn_in_ready, &conn_out_ready);
|
|
- if (sigprocmask(SIG_UNBLOCK, &bsigset, &osigset) == -1)
|
|
+ if (sigprocmask(SIG_SETMASK, &osigset, NULL) == -1)
|
|
error_f("osigset sigprocmask: %s", strerror(errno));
|
|
|
|
if (received_sigterm) {
|