From owner-svn-src-projects@freebsd.org Tue Jan 17 12:43:57 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 1C8BACB2C6D for ; Tue, 17 Jan 2017 12:43:57 +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 C6C14179B; Tue, 17 Jan 2017 12:43:56 +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 v0HChtEH040910; Tue, 17 Jan 2017 12:43:55 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0HChtBl040909; Tue, 17 Jan 2017 12:43:55 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201701171243.v0HChtBl040909@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Tue, 17 Jan 2017 12:43:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r312342 - 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: Tue, 17 Jan 2017 12:43:57 -0000 Author: ae Date: Tue Jan 17 12:43:55 2017 New Revision: 312342 URL: https://svnweb.freebsd.org/changeset/base/312342 Log: RFC2367 doesn't allow update anything but state and lifetimes for SAs in MATURE state. Do not require presence of SADB_EXT_KEY_ENCRYPT and SADB_EXT_KEY_AUTH in the general checks for SADB_UPDATE message. They only required for MATURE SAs. For LARVAL SAs on the contrary these headers are not allowed. Modified: projects/ipsec/sys/netipsec/key.c Modified: projects/ipsec/sys/netipsec/key.c ============================================================================== --- projects/ipsec/sys/netipsec/key.c Tue Jan 17 10:50:28 2017 (r312341) +++ projects/ipsec/sys/netipsec/key.c Tue Jan 17 12:43:55 2017 (r312342) @@ -4968,12 +4968,6 @@ key_update(struct socket *so, struct mbu if (SADB_CHECKHDR(mhp, SADB_EXT_SA) || SADB_CHECKHDR(mhp, SADB_EXT_ADDRESS_SRC) || SADB_CHECKHDR(mhp, SADB_EXT_ADDRESS_DST) || - (mhp->msg->sadb_msg_satype == SADB_SATYPE_ESP && ( - SADB_CHECKHDR(mhp, SADB_EXT_KEY_ENCRYPT) || - SADB_CHECKLEN(mhp, SADB_EXT_KEY_ENCRYPT))) || - (mhp->msg->sadb_msg_satype == SADB_SATYPE_AH && ( - SADB_CHECKHDR(mhp, SADB_EXT_KEY_AUTH) || - SADB_CHECKLEN(mhp, SADB_EXT_KEY_AUTH))) || (SADB_CHECKHDR(mhp, SADB_EXT_LIFETIME_HARD) && !SADB_CHECKHDR(mhp, SADB_EXT_LIFETIME_SOFT)) || (SADB_CHECKHDR(mhp, SADB_EXT_LIFETIME_SOFT) && @@ -5053,6 +5047,16 @@ key_update(struct socket *so, struct mbu } if (sav->state == SADB_SASTATE_LARVAL) { + if ((mhp->msg->sadb_msg_satype == SADB_SATYPE_ESP && + SADB_CHECKHDR(mhp, SADB_EXT_KEY_ENCRYPT)) || + (mhp->msg->sadb_msg_satype == SADB_SATYPE_AH && + SADB_CHECKHDR(mhp, SADB_EXT_KEY_AUTH))) { + ipseclog((LOG_DEBUG, + "%s: invalid message: missing required header.\n", + __func__)); + key_freesav(&sav); + return key_senderror(so, m, EINVAL); + } /* * We can set any values except src, dst and SPI. */