dilim/openssh-portable
1
0
Fork 0
mirror of https://github.com/openssh/openssh-portable.git synced 2026-06-24 08:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream: avoid leak of fingerprint on error path; from Lidong Yan via

Browse Source 
GHPR611

OpenBSD-Commit-ID: 253f6f7d729d8636da23ac9925b60b494e85a810
This commit is contained in:
djm@openbsd.org
2025-11-25 00:57:04 +00:00
committed by Damien Miller
parent 6157e1c410
commit c23122c5ea
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hostfile.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: hostfile.c,v 1.99 2025/05/06 05:40:56 djm Exp $ */ /* $OpenBSD: hostfile.c,v 1.100 2025/11/25 00:57:04 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -626,7 +626,7 @@ hostfile_replace_entries(const char *filename, const char *host, const char *ip,
int r, fd, oerrno = 0; int r, fd, oerrno = 0;
int loglevel = quiet ? SYSLOG_LEVEL_DEBUG1 : SYSLOG_LEVEL_VERBOSE; int loglevel = quiet ? SYSLOG_LEVEL_DEBUG1 : SYSLOG_LEVEL_VERBOSE;
struct host_delete_ctx ctx; struct host_delete_ctx ctx;
char *fp, *temp = NULL, *back = NULL; char *fp = NULL, *temp = NULL, *back = NULL;
const char *what; const char *what;
mode_t omask; mode_t omask;
size_t i; size_t i;
@@ -715,6 +715,7 @@ hostfile_replace_entries(const char *filename, const char *host, const char *ip,
host, ip == NULL ? "" : ",", ip == NULL ? "" : ip, filename, host, ip == NULL ? "" : ",", ip == NULL ? "" : ip, filename,
sshkey_ssh_name(keys[i]), fp); sshkey_ssh_name(keys[i]), fp);
free(fp); free(fp);
fp = NULL;
ctx.modified = 1; ctx.modified = 1;
} }
fclose(ctx.out); fclose(ctx.out);
@@ -755,6 +756,7 @@ hostfile_replace_entries(const char *filename, const char *host, const char *ip,
unlink(temp); unlink(temp);
free(temp); free(temp);
free(back); free(back);
free(fp);
if (ctx.out != NULL) if (ctx.out != NULL)
fclose(ctx.out); fclose(ctx.out);
free(ctx.match_keys); free(ctx.match_keys);