openssh: Fix CVE-2025-26465

Upstream-Status: Backport from https://github.com/openssh/openssh-portable/commit/0832aac79517611dd4de93ad0a83577994d9c907

Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>

diff --git a/meta/recipes-connectivity/openssh/openssh/CVE-2025-26465.patch b/meta/recipes-connectivity/openssh/openssh/CVE-2025-26465.patch
new file mode 100644 (file)
index 0000000..ffc798a
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh/CVE-2025-26465.patch
@@ -0,0 +1,140 @@
+From 0832aac79517611dd4de93ad0a83577994d9c907 Mon Sep 17 00:00:00 2001
+From: "djm@openbsd.org" <djm@openbsd.org>
+Date: Tue, 18 Feb 2025 08:02:48 +0000
+Subject: [PATCH] upstream: Fix cases where error codes were not correctly set
+
+Reported by the Qualys Security Advisory team. ok markus@
+
+OpenBSD-Commit-ID: 7bcd4ffe0fa1e27ff98d451fb9c22f5fae6e610d
+
+Upstream-Status: Backport [https://github.com/openssh/openssh-portable/commit/0832aac79517611dd4de93ad0a83577994d9c907]
+CVE: CVE-2025-26465
+Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
+---
+ krl.c           | 2 ++
+ ssh-agent.c     | 3 +++
+ ssh-sk-client.c | 2 ++
+ sshconnect2.c   | 5 ++++-
+ sshsig.c        | 1 +
+ 5 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/krl.c b/krl.c
+index 17b88ed..aef2001 100644
+--- a/krl.c
++++ b/krl.c
+@@ -674,6 +674,7 @@ revoked_certs_generate(struct revoked_certs *rc, struct sshbuf *buf)
+                       break;
+               case KRL_SECTION_CERT_SERIAL_BITMAP:
+                       if (rs->lo - bitmap_start > INT_MAX) {
++                              r = SSH_ERR_INVALID_FORMAT;
+                               error_f("insane bitmap gap");
+                               goto out;
+                       }
+@@ -1008,6 +1009,7 @@ ssh_krl_from_blob(struct sshbuf *buf, struct ssh_krl **krlp,
+               goto out;
+ 
+       if ((krl = ssh_krl_init()) == NULL) {
++              r = SSH_ERR_ALLOC_FAIL;
+               error_f("alloc failed");
+               goto out;
+       }
+diff --git a/ssh-agent.c b/ssh-agent.c
+index 4dbb4f3..6382ef4 100644
+--- a/ssh-agent.c
++++ b/ssh-agent.c
+@@ -1198,6 +1198,7 @@ parse_key_constraint_extension(struct sshbuf *m, char **sk_providerp,
+           "restrict-destination-v00@openssh.com") == 0) {
+               if (*dcsp != NULL) {
+                       error_f("%s already set", ext_name);
++                      r = SSH_ERR_INVALID_FORMAT;
+                       goto out;
+               }
+               if ((r = sshbuf_froms(m, &b)) != 0) {
+@@ -1207,6 +1208,7 @@ parse_key_constraint_extension(struct sshbuf *m, char **sk_providerp,
+               while (sshbuf_len(b) != 0) {
+                       if (*ndcsp >= AGENT_MAX_DEST_CONSTRAINTS) {
+                               error_f("too many %s constraints", ext_name);
++                              r = SSH_ERR_INVALID_FORMAT;
+                               goto out;
+                       }
+                       *dcsp = xrecallocarray(*dcsp, *ndcsp, *ndcsp + 1,
+@@ -1663,6 +1665,7 @@ process_ext_session_bind(SocketEntry *e)
+       /* record new key/sid */
+       if (e->nsession_ids >= AGENT_MAX_SESSION_IDS) {
+               error_f("too many session IDs recorded");
++              r = -1;
+               goto out;
+       }
+       e->session_ids = xrecallocarray(e->session_ids, e->nsession_ids,
+diff --git a/ssh-sk-client.c b/ssh-sk-client.c
+index 321fe53..750accb 100644
+--- a/ssh-sk-client.c
++++ b/ssh-sk-client.c
+@@ -439,6 +439,7 @@ sshsk_load_resident(const char *provider_path, const char *device,
+               }
+               if ((srk = calloc(1, sizeof(*srk))) == NULL) {
+                       error_f("calloc failed");
++                      r = SSH_ERR_ALLOC_FAIL;
+                       goto out;
+               }
+               srk->key = key;
+@@ -450,6 +451,7 @@ sshsk_load_resident(const char *provider_path, const char *device,
+               if ((tmp = recallocarray(srks, nsrks, nsrks + 1,
+                   sizeof(*srks))) == NULL) {
+                       error_f("recallocarray keys failed");
++                      r = SSH_ERR_ALLOC_FAIL;
+                       goto out;
+               }
+               debug_f("srks[%zu]: %s %s uidlen %zu", nsrks,
+diff --git a/sshconnect2.c b/sshconnect2.c
+index 83ae4a4..6cfae2a 100644
+--- a/sshconnect2.c
++++ b/sshconnect2.c
+@@ -97,7 +97,7 @@ static int
+ verify_host_key_callback(struct sshkey *hostkey, struct ssh *ssh)
+ {
+       if (verify_host_key(xxx_host, xxx_hostaddr, hostkey,
+-          xxx_conn_info) == -1)
++          xxx_conn_info) != 0)
+               fatal("Host key verification failed.");
+       return 0;
+ }
+@@ -713,6 +713,7 @@ input_userauth_pk_ok(int type, u_int32_t seq, struct ssh *ssh)
+ 
+       if ((pktype = sshkey_type_from_name(pkalg)) == KEY_UNSPEC) {
+               debug_f("server sent unknown pkalg %s", pkalg);
++              r = SSH_ERR_INVALID_FORMAT;
+               goto done;
+       }
+       if ((r = sshkey_from_blob(pkblob, blen, &key)) != 0) {
+@@ -723,6 +724,7 @@ input_userauth_pk_ok(int type, u_int32_t seq, struct ssh *ssh)
+               error("input_userauth_pk_ok: type mismatch "
+                   "for decoded key (received %d, expected %d)",
+                   key->type, pktype);
++              r = SSH_ERR_INVALID_FORMAT;
+               goto done;
+       }
+ 
+@@ -742,6 +744,7 @@ input_userauth_pk_ok(int type, u_int32_t seq, struct ssh *ssh)
+                   SSH_FP_DEFAULT);
+               error_f("server replied with unknown key: %s %s",
+                   sshkey_type(key), fp == NULL ? "<ERROR>" : fp);
++              r = SSH_ERR_INVALID_FORMAT;
+               goto done;
+       }
+       ident = format_identity(id);
+diff --git a/sshsig.c b/sshsig.c
+index 7736134..76d7c21 100644
+--- a/sshsig.c
++++ b/sshsig.c
+@@ -857,6 +857,7 @@ cert_filter_principals(const char *path, u_long linenum,
+       }
+       if ((principals = sshbuf_dup_string(nprincipals)) == NULL) {
+               error_f("buffer error");
++              r = SSH_ERR_ALLOC_FAIL;
+               goto out;
+       }
+       /* success */
+-- 
+2.25.1
+

diff --git a/meta/recipes-connectivity/openssh/openssh_8.9p1.bb b/meta/recipes-connectivity/openssh/openssh_8.9p1.bb
index d2c477a06271f04bc0255523b7bf0c565028ad6d..54b4d238ebe888aa56fd4741767131b09c2da562 100644 (file)
--- a/meta/recipes-connectivity/openssh/openssh_8.9p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_8.9p1.bb
@@ -37,6 +37,7 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
            file://CVE-2023-51384.patch \
            file://CVE-2023-51385.patch \
            file://CVE-2024-6387.patch \
+           file://CVE-2025-26465.patch \
            "
 SRC_URI[sha256sum] = "fd497654b7ab1686dac672fb83dfb4ba4096e8b5ffcdaccd262380ae58bec5e7"