From: djm@openbsd.org <djm@openbsd.org>
Date: Mon, 15 Sep 2025 04:51:35 +0000 (+0000)
Subject: upstream: memleak of keys not used for authentication; ok
X-Git-Tag: V_10_1_P1~71
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0bb37080c86674de7cdfb56c80add3cd316c68a8;p=thirdparty%2Fopenssh-portable.git

upstream: memleak of keys not used for authentication; ok

dtucker@

OpenBSD-Commit-ID: ddfda79d243150fbd382d8f2cd75a90a072b3669
---

diff --git a/sshconnect2.c b/sshconnect2.c
index 1ee6000ab..b3679c9d7 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.377 2025/02/18 08:02:48 djm Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.378 2025/09/15 04:51:35 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -1815,7 +1815,7 @@ pubkey_prepare(struct ssh *ssh, Authctxt *authctxt)
 		TAILQ_REMOVE(preferred, id, next);
 		sshkey_free(id->key);
 		free(id->filename);
-		memset(id, 0, sizeof(*id));
+		freezero(id, sizeof(*id));
 	}
 	/* List the keys we plan on using */
 	TAILQ_FOREACH_SAFE(id, preferred, next, id2) {