From owner-svn-src-projects@freebsd.org Mon Jan 2 10:16:42 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C20C4C9B908 for ; Mon, 2 Jan 2017 10:16:42 +0000 (UTC) (envelope-from ae@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 mx1.freebsd.org (Postfix) with ESMTPS id 6A7F814B2; Mon, 2 Jan 2017 10:16:42 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v02AGfsD026049; Mon, 2 Jan 2017 10:16:41 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v02AGfga026047; Mon, 2 Jan 2017 10:16:41 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201701021016.v02AGfga026047@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Mon, 2 Jan 2017 10:16:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r311097 - in projects/ipsec/sys: net netipsec X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jan 2017 10:16:42 -0000 Author: ae Date: Mon Jan 2 10:16:41 2017 New Revision: 311097 URL: https://svnweb.freebsd.org/changeset/base/311097 Log: Revert r309611. At least racoon depends on such notifications. Also fix SP reference leak. Modified: projects/ipsec/sys/net/if_ipsec.c projects/ipsec/sys/netipsec/key.c Modified: projects/ipsec/sys/net/if_ipsec.c ============================================================================== --- projects/ipsec/sys/net/if_ipsec.c Mon Jan 2 09:50:51 2017 (r311096) +++ projects/ipsec/sys/net/if_ipsec.c Mon Jan 2 10:16:41 2017 (r311097) @@ -956,8 +956,11 @@ ipsec_set_tunnel(struct ipsec_softc *sc, } sc->ifp->if_drv_flags |= IFF_DRV_RUNNING; - if (f != 0) + if (f != 0) { key_unregister_ifnet(oldsp, IPSEC_SPCOUNT); + for (i = 0; i < IPSEC_SPCOUNT; i++) + key_freesp(&oldsp[i]); + } return (0); } @@ -986,5 +989,7 @@ ipsec_delete_tunnel(struct ifnet *ifp, i if (!locked) IPSEC_SC_WUNLOCK(); key_unregister_ifnet(oldsp, IPSEC_SPCOUNT); + for (i = 0; i < IPSEC_SPCOUNT; i++) + key_freesp(&oldsp[i]); } } Modified: projects/ipsec/sys/netipsec/key.c ============================================================================== --- projects/ipsec/sys/netipsec/key.c Mon Jan 2 09:50:51 2017 (r311096) +++ projects/ipsec/sys/netipsec/key.c Mon Jan 2 10:16:41 2017 (r311097) @@ -1132,6 +1132,7 @@ done: int key_register_ifnet(struct secpolicy **spp, u_int count) { + struct mbuf *m; u_int i; SPTREE_WLOCK(); @@ -1161,12 +1162,21 @@ key_register_ifnet(struct secpolicy **sp spp[i]->state = IPSEC_SPSTATE_IFNET; } SPTREE_WUNLOCK(); + /* + * Notify user processes about new SP. + */ + for (i = 0; i < count; i++) { + m = key_setdumpsp(spp[i], SADB_X_SPDADD, 0, 0); + if (m != NULL) + key_sendup_mbuf(NULL, m, KEY_SENDUP_ALL); + } return (0); } void key_unregister_ifnet(struct secpolicy **spp, u_int count) { + struct mbuf *m; u_int i; SPTREE_WLOCK(); @@ -1183,6 +1193,12 @@ key_unregister_ifnet(struct secpolicy ** LIST_REMOVE(spp[i], idhash); } SPTREE_WUNLOCK(); + + for (i = 0; i < count; i++) { + m = key_setdumpsp(spp[i], SADB_X_SPDDELETE, 0, 0); + if (m != NULL) + key_sendup_mbuf(NULL, m, KEY_SENDUP_ALL); + } } /*