tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: fix leak of CanonicalizePermittedCNAMEs on error path; 

spotted by Coverity (CID 438039)

OpenBSD-Commit-ID: 208839699939721f452a4418afc028a9f9d3d8af
This commit is contained in:
djm@openbsd.org 2024-03-04 04:13:18 +00:00 committed by Damien Miller
parent 65a44a8a4f
commit 3deb501f86
No known key found for this signature in database
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
readconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.c,v 1.385 2024/03/04 02:16:11 djm Exp $ */ /* $OpenBSD: readconf.c,v 1.386 2024/03/04 04:13:18 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
@ -890,6 +890,20 @@ parse_token(const char *cp, const char *filename, int linenum,
return oBadOption; return oBadOption;
} }
static void
free_canon_cnames(struct allowed_cname *cnames, u_int n)
{
u_int i;
if (cnames == NULL || n == 0)
return;
for (i = 0; i < n; i++) {
free(cnames[i].source_list);
free(cnames[i].target_list);
}
free(cnames);
}
/* Multistate option parsing */ /* Multistate option parsing */
struct multistate { struct multistate {
char *key; char *key;
@ -2160,13 +2174,10 @@ parse_pubkey_algos:
if (found && *activep) { if (found && *activep) {
options->permitted_cnames = cnames; options->permitted_cnames = cnames;
options->num_permitted_cnames = ncnames; options->num_permitted_cnames = ncnames;
} else { cnames = NULL; /* transferred */
for (i = 0; i < ncnames; i++) { ncnames = 0;
free(cnames[i].source_list);
free(cnames[i].target_list);
}
free(cnames);
} }
/* un-transferred cnames is cleaned up before exit */
break; break;
case oCanonicalizeHostname: case oCanonicalizeHostname:
@ -2405,6 +2416,7 @@ parse_pubkey_algos:
/* success */ /* success */
ret = 0; ret = 0;
out: out:
free_canon_cnames(cnames, ncnames);
opt_array_free2(strs, NULL, nstrs); opt_array_free2(strs, NULL, nstrs);
argv_free(oav, oac); argv_free(oav, oac);
return ret; return ret;