diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2015-07-15 14:39:14 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2015-07-15 14:39:14 +0000 |
| commit | 8fb80ed86b493cc794580221cb85ac972648c47d (patch) | |
| tree | 014330c5bd645836c65c3b188a22fb099d785f48 /usr.sbin/httpd/server.c | |
| parent | ff38cdef117670e8307755537aa36200ceb3df6c (diff) | |
Fix memory leaks that can occur when config_getserver() fails.
config.c r1.34 and r1.30 introduced potential memory leaks for auth and
return_uri when config_getserver fails. Fix this by switching to
serverconfig_free() and adding the missing free for srv_conf->auth.
While here, make serverconfig_free() a little more bulletproof by
explicit_bzero()ing key material.
ok reyk@
Diffstat (limited to 'usr.sbin/httpd/server.c')
| -rw-r--r-- | usr.sbin/httpd/server.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/usr.sbin/httpd/server.c b/usr.sbin/httpd/server.c index ca67a470174..66c0e401706 100644 --- a/usr.sbin/httpd/server.c +++ b/usr.sbin/httpd/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.63 2015/04/23 16:59:28 florian Exp $ */ +/* $OpenBSD: server.c,v 1.64 2015/07/15 14:39:13 jsing Exp $ */ /* * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org> @@ -312,20 +312,31 @@ server_purge(struct server *srv) void serverconfig_free(struct server_config *srv_conf) { + free(srv_conf->auth); free(srv_conf->return_uri); free(srv_conf->tls_cert_file); - free(srv_conf->tls_cert); free(srv_conf->tls_key_file); - free(srv_conf->tls_key); + + if (srv_conf->tls_cert != NULL) { + explicit_bzero(srv_conf->tls_cert, srv_conf->tls_cert_len); + free(srv_conf->tls_cert); + } + + if (srv_conf->tls_key != NULL) { + explicit_bzero(srv_conf->tls_key, srv_conf->tls_key_len); + free(srv_conf->tls_key); + } } void serverconfig_reset(struct server_config *srv_conf) { - srv_conf->tls_cert_file = srv_conf->tls_key_file = NULL; - srv_conf->tls_cert = srv_conf->tls_key = NULL; - srv_conf->return_uri = NULL; srv_conf->auth = NULL; + srv_conf->return_uri = NULL; + srv_conf->tls_cert = NULL; + srv_conf->tls_cert_file = NULL; + srv_conf->tls_key = NULL; + srv_conf->tls_key_file = NULL; } struct server * |