9e3f4b36c8
Resolves: RHEL-213033 Resolves: RHEL-213041 Resolves: RHEL-213047 Resolves: RHEL-213081 Resolves: RHEL-213114 Resolves: RHEL-213119 Resolves: RHEL-213151
67 lines
2.2 KiB
Diff
67 lines
2.2 KiB
Diff
From 1ebfc368a59d4fe72cbca2a0813e1166fa8b95ca Mon Sep 17 00:00:00 2001
|
|
From: Jakub Jelen <jjelen@redhat.com>
|
|
Date: Thu, 26 Mar 2026 16:32:24 +0100
|
|
Subject: [PATCH 03/12] CVE-2026-59845 socket: Properly check fork() return
|
|
code
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
During execution of proxy command, when fork() fails, its return value
|
|
is stored in pid and when the parent process attempts to kill it,
|
|
it sends the kill signal to all processes the calling application has
|
|
access to (except for init).
|
|
|
|
This caused nard to debug issues when the system under the load was hitting
|
|
fork failures, which resulted in killing of all the system processes
|
|
(of given user).
|
|
|
|
Reported and first patch iteration provided by: Halil Oktay (oblivionsage).
|
|
|
|
This code missing fork return value check is in libssh since 2010
|
|
(f31a14b7932ef4cc165ddd8f1f1a5b23eb21beb3), but this issue is exploitable only
|
|
since libssh 0.9.0 as previously there was no implementation of killing
|
|
ProxyCommand children.
|
|
|
|
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
|
|
Reviewed-by: Pavol Žáčik <pzacik@redhat.com>
|
|
(cherry picked from commit 92b6fb9c5e2d1606e8f809fd884ab6dd4d3b7d45)
|
|
---
|
|
src/socket.c | 13 ++++++++++++-
|
|
1 file changed, 12 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/socket.c b/src/socket.c
|
|
index 35838e86..6300fcb2 100644
|
|
--- a/src/socket.c
|
|
+++ b/src/socket.c
|
|
@@ -942,6 +942,7 @@ ssh_execute_command(const char *command, socket_t in, socket_t out)
|
|
int
|
|
ssh_socket_connect_proxycommand(ssh_socket s, const char *command)
|
|
{
|
|
+ char err_msg[SSH_ERRNO_MSG_MAX] = {0};
|
|
socket_t pair[2];
|
|
int pid;
|
|
int rc;
|
|
@@ -959,7 +960,17 @@ ssh_socket_connect_proxycommand(ssh_socket s, const char *command)
|
|
pid = fork();
|
|
if (pid == 0) {
|
|
ssh_execute_command(command, pair[0], pair[0]);
|
|
- /* Does not return */
|
|
+ /* child: Does not return */
|
|
+ }
|
|
+ /* parent */
|
|
+ if (pid == -1) {
|
|
+ close(pair[0]);
|
|
+ close(pair[1]);
|
|
+ ssh_set_error(s->session,
|
|
+ SSH_FATAL,
|
|
+ "fork failed: %s",
|
|
+ ssh_strerror(errno, err_msg, SSH_ERRNO_MSG_MAX));
|
|
+ return SSH_ERROR;
|
|
}
|
|
s->proxy_pid = pid;
|
|
close(pair[0]);
|
|
--
|
|
2.54.0
|
|
|