upstream: Fix cases where error codes were not correctly set

Reported by the Qualys Security Advisory team. ok markus@

OpenBSD-Commit-ID: 7bcd4ffe0fa1e27ff98d451fb9c22f5fae6e610d

diff --git a/krl.c b/krl.c
index e2efdf0667a774fea80f2056b55c43607ed32174..0d0f69534182d6edcec7d9eaa13a992ec321849b 100644 (file)
--- a/krl.c
+++ b/krl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: krl.c,v 1.59 2023/07/17 05:22:30 djm Exp $ */
+/* $OpenBSD: krl.c,v 1.60 2025/02/18 08:02:48 djm Exp $ */
 /*
  * Copyright (c) 2012 Damien Miller <djm@mindrot.org>
  *
@@ -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;
                        }
@@ -1059,6 +1060,7 @@ ssh_krl_from_blob(struct sshbuf *buf, struct ssh_krl **krlp)
        }
 
        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 48973b2c142addaf9f091876973584bd799d0b10..c27c5a956f2c8402c4579e71757365d84a1a83c8 100644 (file)
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.309 2024/11/06 22:51:26 djm Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.310 2025/02/18 08:02:48 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1220,6 +1220,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) {
@@ -1229,6 +1230,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,
@@ -1246,6 +1248,7 @@ parse_key_constraint_extension(struct sshbuf *m, char **sk_providerp,
                }
                if (*certs != NULL) {
                        error_f("%s already set", ext_name);
+                       r = SSH_ERR_INVALID_FORMAT;
                        goto out;
                }
                if ((r = sshbuf_get_u8(m, &v)) != 0 ||
@@ -1257,6 +1260,7 @@ parse_key_constraint_extension(struct sshbuf *m, char **sk_providerp,
                while (sshbuf_len(b) != 0) {
                        if (*ncerts >= AGENT_MAX_EXT_CERTS) {
                                error_f("too many %s constraints", ext_name);
+                               r = SSH_ERR_INVALID_FORMAT;
                                goto out;
                        }
                        *certs = xrecallocarray(*certs, *ncerts, *ncerts + 1,
@@ -1757,6 +1761,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 321fe53a2d9195b04ede36d32e71e7529b5af209..06fad22134fba700a08787dd3f4a1faa39f233b4 100644 (file)
--- a/ssh-sk-client.c
+++ b/ssh-sk-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-sk-client.c,v 1.12 2022/01/14 03:34:00 djm Exp $ */
+/* $OpenBSD: ssh-sk-client.c,v 1.13 2025/02/18 08:02:48 djm Exp $ */
 /*
  * Copyright (c) 2019 Google LLC
  *
@@ -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 a69c4da18773e20d2c749d1a8ea8cd5c60dac71b..1ee6000ab0cc63ef08e71b28f77a88a1f7bdac52 100644 (file)
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.376 2024/10/18 05:45:40 djm Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.377 2025/02/18 08:02:48 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -99,7 +99,7 @@ verify_host_key_callback(struct sshkey *hostkey, struct ssh *ssh)
            options.required_rsa_size)) != 0)
                fatal_r(r, "Bad server host key");
        if (verify_host_key(xxx_host, xxx_hostaddr, hostkey,
-           xxx_conn_info) == -1)
+           xxx_conn_info) != 0)
                fatal("Host key verification failed.");
        return 0;
 }
@@ -699,6 +699,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) {
@@ -709,6 +710,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;
        }
 
@@ -728,6 +730,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 6e03c0b06d8562857a81f07f55f49ea00489b889..3da005d621f94dfad76ba7c4de2313fcc15f1ff8 100644 (file)
--- a/sshsig.c
+++ b/sshsig.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshsig.c,v 1.37 2024/11/26 22:05:51 djm Exp $ */
+/* $OpenBSD: sshsig.c,v 1.38 2025/02/18 08:02:48 djm Exp $ */
 /*
  * Copyright (c) 2019 Google LLC
  *
@@ -879,6 +879,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 */