From b35ee876adc92a208d47194772e99f9c71e0bedb Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Mon, 28 Apr 2025 11:04:55 +0200
Subject: [PATCH] CVE-2025-4878 legacy: Properly check return value to avoid
 NULL pointer dereference

Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>

CVE: CVE-2025-4878

Upstream-Status: Backport [https://git.libssh.org/projects/libssh.git/commit/?id=b35ee876adc92a208d47194772e99f9c71e0bedb]

Signed-off-by: Divya Chellam <divya.chellam@windriver.com>
---
 src/legacy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/legacy.c b/src/legacy.c
index 7359040c..f73ef6cc 100644
--- a/src/legacy.c
+++ b/src/legacy.c
@@ -452,7 +452,7 @@ ssh_private_key privatekey_from_file(ssh_session session,
                                      auth_fn,
                                      auth_data,
                                      &key);
-    if (rc == SSH_ERROR) {
+    if (rc != SSH_OK) {
         return NULL;
     }
 
-- 
2.40.0