From owner-dev-commits-src-main@freebsd.org Tue Dec 29 14:52:31 2020 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0F55C4C1A3C; Tue, 29 Dec 2020 14:52:31 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D4y7f6qD5z4fby; Tue, 29 Dec 2020 14:52:30 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 DCF6356F3; Tue, 29 Dec 2020 14:52:30 +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 0BTEqUlX024508; Tue, 29 Dec 2020 14:52:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 0BTEqUpX024507; Tue, 29 Dec 2020 14:52:30 GMT (envelope-from git) Date: Tue, 29 Dec 2020 14:52:30 GMT Message-Id: <202012291452.0BTEqUpX024507@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Edward Tomasz Napierala Subject: git: 7db3d97e0ffd - main - iscsid(8): free data allocated by getaddrinfo(3) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: trasz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7db3d97e0ffd59985b68b30faa012d40da99faa4 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "Commit messages for the main branch of the src repository." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Dec 2020 14:52:31 -0000 The branch main has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=7db3d97e0ffd59985b68b30faa012d40da99faa4 commit 7db3d97e0ffd59985b68b30faa012d40da99faa4 Author: Edward Tomasz Napierala AuthorDate: 2020-12-29 14:47:35 +0000 Commit: Edward Tomasz Napierala CommitDate: 2020-12-29 14:52:23 +0000 iscsid(8): free data allocated by getaddrinfo(3) Reviewed By: mav Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D27329 --- usr.sbin/iscsid/iscsid.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/usr.sbin/iscsid/iscsid.c b/usr.sbin/iscsid/iscsid.c index 7c8e556510ab..a9c68825fb0a 100644 --- a/usr.sbin/iscsid/iscsid.c +++ b/usr.sbin/iscsid/iscsid.c @@ -253,6 +253,10 @@ connection_new(int iscsi_fd, const struct iscsi_daemon_request *request) "using ICL kernel proxy: ISCSIDCONNECT", to_addr); } + if (from_ai != NULL) + freeaddrinfo(from_ai); + freeaddrinfo(to_ai); + return (conn); } #endif /* ICL_KERNEL_PROXY */ @@ -330,6 +334,10 @@ connection_new(int iscsi_fd, const struct iscsi_daemon_request *request) log_err(1, "failed to connect to %s", to_addr); } + if (from_ai != NULL) + freeaddrinfo(from_ai); + freeaddrinfo(to_ai); + return (conn); }