From owner-svn-src-projects@freebsd.org Sun Jan 8 21:42:20 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 F23B1CA6A8B for ; Sun, 8 Jan 2017 21:42:20 +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 BF44A108D; Sun, 8 Jan 2017 21:42:20 +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 v08LgJpl097334; Sun, 8 Jan 2017 21:42:19 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v08LgJXd097333; Sun, 8 Jan 2017 21:42:19 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201701082142.v08LgJXd097333@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Sun, 8 Jan 2017 21:42:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r311705 - projects/ipsec/sys/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: Sun, 08 Jan 2017 21:42:21 -0000 Author: ae Date: Sun Jan 8 21:42:19 2017 New Revision: 311705 URL: https://svnweb.freebsd.org/changeset/base/311705 Log: Hold INP_RLOCK in ipsec_get_pcbpolicy() while retrieving INPCB policy. Modified: projects/ipsec/sys/netipsec/ipsec_pcb.c Modified: projects/ipsec/sys/netipsec/ipsec_pcb.c ============================================================================== --- projects/ipsec/sys/netipsec/ipsec_pcb.c Sun Jan 8 21:30:04 2017 (r311704) +++ projects/ipsec/sys/netipsec/ipsec_pcb.c Sun Jan 8 21:42:19 2017 (r311705) @@ -360,6 +360,8 @@ ipsec_get_pcbpolicy(struct inpcb *inp, v int error, flags; xpl = (struct sadb_x_policy *)request; + + INP_RLOCK(inp); flags = inp->inp_sp->flags; /* Select direction. */ switch (xpl->sadb_x_policy_dir) { @@ -372,6 +374,7 @@ ipsec_get_pcbpolicy(struct inpcb *inp, v flags &= INP_OUTBOUND_POLICY; break; default: + INP_RUNLOCK(inp); ipseclog((LOG_ERR, "%s: invalid direction=%u\n", __func__, xpl->sadb_x_policy_dir)); return (EINVAL); @@ -379,6 +382,7 @@ ipsec_get_pcbpolicy(struct inpcb *inp, v if (flags == 0) { /* Return ENTRUST policy */ + INP_RUNLOCK(inp); xpl->sadb_x_policy_exttype = SADB_X_EXT_POLICY; xpl->sadb_x_policy_type = IPSEC_POLICY_ENTRUST; xpl->sadb_x_policy_id = 0; @@ -392,6 +396,7 @@ ipsec_get_pcbpolicy(struct inpcb *inp, v ("sp is NULL, but flags is 0x%04x", inp->inp_sp->flags)); key_addref(sp); + INP_RUNLOCK(inp); error = key_sp2msg(sp, request, len); key_freesp(&sp); if (error == EINVAL)