[openssh-commits] [openssh] 68/87: upstream: Correctly error on a algorithm allowlist that removes

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit c41a6c4371bb6731a461e29327cdcaeb76383eb0
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Fri Oct 30 08:11:21 2026 +0000

    upstream: Correctly error on a algorithm allowlist that removes
    
    all algorithms, e.g. `PubkeyAcceptedAlgorithms -*` rather than defaulting
    back to the full list
    
    Anthropic ANT-2026-O2RQ9GNA
    
    OpenBSD-Commit-ID: 6f4e3bd0376e568dc2af2c64a3b0b78edb16997c
---
 kex-names.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kex-names.c b/kex-names.c
index 116150316..25faf78e3 100644
--- a/kex-names.c
+++ b/kex-names.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex-names.c,v 1.10 2026/08/08 07:27:54 djm Exp $ */
+/* $OpenBSD: kex-names.c,v 1.11 2026/10/30 08:11:21 djm Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
@@ -265,13 +265,12 @@ kex_assemble_names(char **listp, const char *def, const char *all)
 		list = tmp;
 	} else if (*list == '-') {
 		/* Remove names from default list */
-		if ((*listp = match_filter_denylist(def, list + 1)) == NULL) {
+		if ((ret = match_filter_denylist(def, list + 1)) == NULL) {
 			r = SSH_ERR_ALLOC_FAIL;
 			goto fail;
 		}
-		free(list);
 		/* filtering has already been done */
-		return 0;
+		goto done;
 	} else if (*list == '^') {
 		/* Place names at head of default list */
 		if ((tmp = kex_names_cat(list + 1, def)) == NULL) {
@@ -313,6 +312,7 @@ kex_assemble_names(char **listp, const char *def, const char *all)
 		free(ret);
 		ret = tmp;
 	}
+ done:
 	if (ret == NULL || *ret == '\0') {
 		/* An empty name-list is an error */
 		/* XXX better error code? */

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.