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
120 lines
3.1 KiB
Diff
120 lines
3.1 KiB
Diff
Index: openssh-9.6p1/openbsd-compat/port-linux-sshd.c
|
|
===================================================================
|
|
--- openssh-9.6p1.orig/openbsd-compat/port-linux-sshd.c
|
|
+++ openssh-9.6p1/openbsd-compat/port-linux-sshd.c
|
|
@@ -33,6 +33,7 @@
|
|
#include "misc.h" /* servconf.h needs misc.h for struct ForwardOptions */
|
|
#include "servconf.h"
|
|
#include "port-linux.h"
|
|
+#include "misc.h"
|
|
#include "sshkey.h"
|
|
#include "hostfile.h"
|
|
#include "auth.h"
|
|
@@ -451,7 +452,7 @@ sshd_selinux_setup_exec_context(char *pw
|
|
void
|
|
sshd_selinux_copy_context(void)
|
|
{
|
|
- security_context_t *ctx;
|
|
+ char *ctx;
|
|
|
|
if (!sshd_selinux_enabled())
|
|
return;
|
|
@@ -470,6 +471,72 @@ sshd_selinux_copy_context(void)
|
|
}
|
|
}
|
|
|
|
+void
|
|
+sshd_selinux_change_privsep_preauth_context(void)
|
|
+{
|
|
+ int len;
|
|
+ char line[1024], *preauth_context = NULL, *cp, *arg;
|
|
+ const char *contexts_path;
|
|
+ FILE *contexts_file;
|
|
+ struct stat sb;
|
|
+
|
|
+ contexts_path = selinux_openssh_contexts_path();
|
|
+ if (contexts_path == NULL) {
|
|
+ debug3_f("Failed to get the path to SELinux context");
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ if ((contexts_file = fopen(contexts_path, "r")) == NULL) {
|
|
+ debug_f("Failed to open SELinux context file");
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ if (fstat(fileno(contexts_file), &sb) != 0 ||
|
|
+ sb.st_uid != 0 || (sb.st_mode & 022) != 0) {
|
|
+ logit_f("SELinux context file needs to be owned by root"
|
|
+ " and not writable by anyone else");
|
|
+ fclose(contexts_file);
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ while (fgets(line, sizeof(line), contexts_file)) {
|
|
+ /* Strip trailing whitespace */
|
|
+ for (len = strlen(line) - 1; len > 0; len--) {
|
|
+ if (strchr(" \t\r\n", line[len]) == NULL)
|
|
+ break;
|
|
+ line[len] = '\0';
|
|
+ }
|
|
+
|
|
+ if (line[0] == '\0')
|
|
+ continue;
|
|
+
|
|
+ cp = line;
|
|
+ arg = strdelim(&cp);
|
|
+ if (arg && *arg == '\0')
|
|
+ arg = strdelim(&cp);
|
|
+
|
|
+ if (arg && strcmp(arg, "privsep_preauth") == 0) {
|
|
+ arg = strdelim(&cp);
|
|
+ if (!arg || *arg == '\0') {
|
|
+ debug_f("privsep_preauth is empty");
|
|
+ fclose(contexts_file);
|
|
+ return;
|
|
+ }
|
|
+ preauth_context = xstrdup(arg);
|
|
+ }
|
|
+ }
|
|
+ fclose(contexts_file);
|
|
+
|
|
+ if (preauth_context == NULL) {
|
|
+ debug_f("Unable to find 'privsep_preauth' option in"
|
|
+ " SELinux context file");
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ ssh_selinux_change_context(preauth_context);
|
|
+ free(preauth_context);
|
|
+}
|
|
+
|
|
#endif
|
|
#endif
|
|
|
|
Index: openssh-9.6p1/openbsd-compat/port-linux.h
|
|
===================================================================
|
|
--- openssh-9.6p1.orig/openbsd-compat/port-linux.h
|
|
+++ openssh-9.6p1/openbsd-compat/port-linux.h
|
|
@@ -27,6 +27,7 @@ int sshd_selinux_enabled(void);
|
|
void sshd_selinux_copy_context(void);
|
|
void sshd_selinux_setup_exec_context(char *);
|
|
int sshd_selinux_setup_env_variables(void);
|
|
+void sshd_selinux_change_privsep_preauth_context(void);
|
|
#endif
|
|
|
|
#ifdef LINUX_OOM_ADJUST
|
|
Index: openssh-9.6p1/sshd-session.c
|
|
===================================================================
|
|
--- openssh-9.6p1.orig/sshd-session.c
|
|
+++ openssh-9.6p1/sshd-session.c
|
|
@@ -511,7 +511,7 @@ privsep_preauth_child(struct ssh *ssh)
|
|
demote_sensitive_data(ssh);
|
|
|
|
#ifdef WITH_SELINUX
|
|
- ssh_selinux_change_context("sshd_net_t");
|
|
+ sshd_selinux_change_privsep_preauth_context();
|
|
#endif
|
|
|
|
/* Demote the child */
|