From: dtucker Date: Wed, 15 Apr 2015 23:23:25 +0000 (+0000) Subject: Plug leak of address passed to logging. bz#2373, patch from jjelen at redhat, X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=5e6098f0c36cb3666513aa2421fea18e798cacb9;p=openbsd Plug leak of address passed to logging. bz#2373, patch from jjelen at redhat, ok markus@ --- diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index 008025f7968..082b5ec5579 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/sshd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.446 2015/04/10 05:16:50 dtucker Exp $ */ +/* $OpenBSD: sshd.c,v 1.447 2015/04/15 23:23:25 dtucker Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1389,7 +1389,7 @@ main(int ac, char **av) int sock_in = -1, sock_out = -1, newsock = -1; const char *remote_ip; int remote_port; - char *fp, *line, *logfile = NULL; + char *fp, *line, *laddr, *logfile = NULL; int config_s[2] = { -1 , -1 }; u_int n; u_int64_t ibytes, obytes; @@ -1986,9 +1986,10 @@ main(int ac, char **av) remote_ip = get_remote_ipaddr(); /* Log the connection. */ + laddr = get_local_ipaddr(sock_in); verbose("Connection from %s port %d on %s port %d", - remote_ip, remote_port, - get_local_ipaddr(sock_in), get_local_port()); + remote_ip, remote_port, laddr, get_local_port()); + free(laddr); /* * We don't want to listen forever unless the other side