From nobody Mon Jun 05 19:06:52 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QZjlK0Xvzz4b106; Mon, 5 Jun 2023 19:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QZjlJ6Vg3z3qY2; Mon, 5 Jun 2023 19:06:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685992012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Izb86PIa/EYuOyUb8yZj4MFuBJdpi40rP+zPm8FtGe8=; b=blMFS1tP6pAPxENTy0/fe/Wso4cMcac55MGIHeoA4AbJxGTRtXodLOa4JlbwfL/D+Uakvx kfxJytL0Nsc2qLFu3C6Cr9ZC7377CkF74K8e4czr1xcDokepbNvs8+sZ9yz+QuVE0HhDuv lrL2KH/E58gAVZSOoUgvYKoL42VHzSCK7l4tIsWxzN39pgfJkJBZPcwxRADB0GPYis4hM8 yPYG6ALSpGi+B+Ueo62TXIPkdED34t3I5niRvSSBet9TAtUEKNtb3VeqCEFE8xde/izinS hiRuHCKPjOd2mHtl9bIHFeRqg1vSSkmXS3n8138qj3bPgKdl/En4sIewTxdEbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685992012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Izb86PIa/EYuOyUb8yZj4MFuBJdpi40rP+zPm8FtGe8=; b=k00nThZoatfAfpMec8WH/sWi6zETN6rUaE0mPAJ8RwrZUg4yxFBgPuVc8EQ6SGIH6W+xxE ZYDucLDrPuwlFM1H+JHU7kTjmkE5t48yxY6ErxgzUnT2gp2KLrXX+hyQ/Iqwvwr5jauDGw 0r0SDbpsnjQY7oGyshXoaB9YsuYnkRANGqpoNKCTN39I//3tU5ZXek0+LinPLZDLDcJAnm GQuWQ6l/Ca8IBA0OtlidOqeSRRxj63QyPLQka5yOIU2sztrRn23gec+CBfcsnSPuaJdVkP jgoUyM4b3E8dKhwa/rqXQSc4ABTKSbGU9V2GF6xrLc/+ScYA0S3WPctx1AeymQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685992012; a=rsa-sha256; cv=none; b=tDc5PUxjbasc2equ4xFIiV8JlO5DKZtMDbokqfs5P7ki+hHrX6USz37amtwolhpXRKdz+e l7WcLS3irVzoZPW04BbQAkrv+HBWBchJYsv3uS54NxrSlEil9uQyg5flTkTnVCU457+p4M ZLl3Lbf+eZjyWIq/DX8onPxFJfhH5qHG9TRqL3sQYEOmBsVcPncjcQOGPG3ZLE7iL/iWGt RZYqVEV7qHSq0rxbhEqqMxdl4a7b2YGxQqQVjsgQGyG1dpfmXtzMKgGNJ6UeoPrRvwP/xB TSs+22jG7eS7FOPYbmJ09RTfR52R0uPx7avD91RS0cocL0tis4KTpPKLEjHNCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QZjlJ5VDzz10Hl; Mon, 5 Jun 2023 19:06:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 355J6qXe085713; Mon, 5 Jun 2023 19:06:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 355J6q8D085712; Mon, 5 Jun 2023 19:06:52 GMT (envelope-from git) Date: Mon, 5 Jun 2023 19:06:52 GMT Message-Id: <202306051906.355J6q8D085712@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 77d002b9cbf4 - stable/12 - ssh: fix leak and apply style(9) to hostname canonicalization List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 77d002b9cbf49168ba6261b5dc84b8e694c24b20 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=77d002b9cbf49168ba6261b5dc84b8e694c24b20 commit 77d002b9cbf49168ba6261b5dc84b8e694c24b20 Author: Ed Maste AuthorDate: 2023-02-08 13:16:53 +0000 Commit: Ed Maste CommitDate: 2023-06-05 19:05:32 +0000 ssh: fix leak and apply style(9) to hostname canonicalization Fixes: bf2e2524a2ce ("ssh: canonicize the host name before...") Fixes: 3e74849a1ee2 ("ssh: canonicize the host name before...") Reviewed by: rew Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38441 (cherry picked from commit 19aba210e1a1b5999bff10cccab5a277060c4d46) (cherry picked from commit 792d3f16868e5f79ab8b11803340251371515f0a) --- crypto/openssh/ssh.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/crypto/openssh/ssh.c b/crypto/openssh/ssh.c index c5a4326bd1c6..b058e8349c63 100644 --- a/crypto/openssh/ssh.c +++ b/crypto/openssh/ssh.c @@ -1397,18 +1397,21 @@ main(int ac, char **av) cinfo->locuser = xstrdup(pw->pw_name); /* Find canonic host name. */ - if (strchr(host, '.') == 0) { + if (strchr(host, '.') == NULL) { struct addrinfo hints; struct addrinfo *ai = NULL; int errgai; + memset(&hints, 0, sizeof(hints)); hints.ai_family = options.address_family; hints.ai_flags = AI_CANONNAME; hints.ai_socktype = SOCK_STREAM; errgai = getaddrinfo(host, NULL, &hints, &ai); if (errgai == 0) { - if (ai->ai_canonname != NULL) + if (ai->ai_canonname != NULL) { + free(host); host = xstrdup(ai->ai_canonname); + } freeaddrinfo(ai); } }