From owner-svn-src-projects@freebsd.org Sun Jan 8 21:30:06 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 068F3CA5FC7 for ; Sun, 8 Jan 2017 21:30:06 +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 CD1BB1945; Sun, 8 Jan 2017 21:30:05 +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 v08LU5VB089738; Sun, 8 Jan 2017 21:30:05 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v08LU57Y089737; Sun, 8 Jan 2017 21:30:05 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201701082130.v08LU57Y089737@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:30:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r311704 - 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:30:06 -0000 Author: ae Date: Sun Jan 8 21:30:04 2017 New Revision: 311704 URL: https://svnweb.freebsd.org/changeset/base/311704 Log: Take INP_WLOCK() in ipsec_set_pcbpolicy() to modify 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:12:46 2017 (r311703) +++ projects/ipsec/sys/netipsec/ipsec_pcb.c Sun Jan 8 21:30:04 2017 (r311704) @@ -276,12 +276,7 @@ ipsec_set_pcbpolicy(struct inpcb *inp, s /* Select direction. */ switch (xpl->sadb_x_policy_dir) { case IPSEC_DIR_INBOUND: - spp = &inp->inp_sp->sp_in; - flags = INP_INBOUND_POLICY; - break; case IPSEC_DIR_OUTBOUND: - spp = &inp->inp_sp->sp_out; - flags = INP_OUTBOUND_POLICY; break; default: ipseclog((LOG_ERR, "%s: invalid direction=%u\n", __func__, @@ -333,6 +328,14 @@ ipsec_set_pcbpolicy(struct inpcb *inp, s return (EINVAL); } + INP_WLOCK(inp); + if (xpl->sadb_x_policy_dir == IPSEC_DIR_INBOUND) { + spp = &inp->inp_sp->sp_in; + flags = INP_INBOUND_POLICY; + } else { + spp = &inp->inp_sp->sp_out; + flags = INP_OUTBOUND_POLICY; + } /* Clear old SP and set new SP. */ if (*spp != NULL) key_freesp(spp); @@ -345,6 +348,7 @@ ipsec_set_pcbpolicy(struct inpcb *inp, s inp->inp_sp->flags |= flags; KEYDBG(IPSEC_DUMP, kdebug_secpolicy(newsp)); } + INP_WUNLOCK(inp); return (0); }