From owner-svn-src-all@freebsd.org Thu Jan 2 09:08:45 2020 Return-Path: Delivered-To: svn-src-all@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 E503F1F1C30; Thu, 2 Jan 2020 09:08:45 +0000 (UTC) (envelope-from melifaro@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) server-signature RSA-PSS (4096 bits) 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 47pMf55sDcz45y8; Thu, 2 Jan 2020 09:08:45 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C46BD18F30; Thu, 2 Jan 2020 09:08:45 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00298jpb026688; Thu, 2 Jan 2020 09:08:45 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00298jO2026687; Thu, 2 Jan 2020 09:08:45 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <202001020908.00298jO2026687@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Thu, 2 Jan 2020 09:08:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356268 - head/sys/net X-SVN-Group: head X-SVN-Commit-Author: melifaro X-SVN-Commit-Paths: head/sys/net X-SVN-Commit-Revision: 356268 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jan 2020 09:08:46 -0000 Author: melifaro Date: Thu Jan 2 09:08:45 2020 New Revision: 356268 URL: https://svnweb.freebsd.org/changeset/base/356268 Log: Plug loopback idaddr refcount leak. Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D22980 Modified: head/sys/net/if.c Modified: head/sys/net/if.c ============================================================================== --- head/sys/net/if.c Thu Jan 2 06:56:28 2020 (r356267) +++ head/sys/net/if.c Thu Jan 2 09:08:45 2020 (r356268) @@ -1836,6 +1836,7 @@ ifa_maintain_loopback_route(int cmd, const char *otype struct rt_addrinfo info; struct sockaddr_dl null_sdl; struct ifnet *ifp; + struct ifaddr *rti_ifa = NULL; ifp = ifa->ifa_ifp; @@ -1846,9 +1847,10 @@ ifa_maintain_loopback_route(int cmd, const char *otype /* explicitly specify (loopback) ifa */ if (info.rti_ifp != NULL) { NET_EPOCH_ENTER(et); - info.rti_ifa = ifaof_ifpforaddr(ifa->ifa_addr, info.rti_ifp); - if (info.rti_ifa != NULL) - ifa_ref(info.rti_ifa); + rti_ifa = ifaof_ifpforaddr(ifa->ifa_addr, info.rti_ifp); + if (rti_ifa != NULL) + ifa_ref(rti_ifa); + info.rti_ifa = rti_ifa; NET_EPOCH_EXIT(et); } } @@ -1858,6 +1860,9 @@ ifa_maintain_loopback_route(int cmd, const char *otype link_init_sdl(ifp, (struct sockaddr *)&null_sdl, ifp->if_type); error = rtrequest1_fib(cmd, &info, NULL, ifp->if_fib); + + if (rti_ifa != NULL) + ifa_free(rti_ifa); if (error != 0 && !(cmd == RTM_ADD && error == EEXIST) &&