From owner-svn-src-all@freebsd.org  Tue Jan 28 18:56:46 2020
Return-Path: <owner-svn-src-all@freebsd.org>
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 C649C237E0F;
 Tue, 28 Jan 2020 18:56:46 +0000 (UTC)
 (envelope-from gordon@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 486bSZ4rTKz4Nmt;
 Tue, 28 Jan 2020 18:56:46 +0000 (UTC)
 (envelope-from gordon@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 A17BF278C2;
 Tue, 28 Jan 2020 18:56:46 +0000 (UTC)
 (envelope-from gordon@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00SIukDw037934;
 Tue, 28 Jan 2020 18:56:46 GMT (envelope-from gordon@FreeBSD.org)
Received: (from gordon@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00SIukjv037933;
 Tue, 28 Jan 2020 18:56:46 GMT (envelope-from gordon@FreeBSD.org)
Message-Id: <202001281856.00SIukjv037933@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gordon set sender to
 gordon@FreeBSD.org using -f
From: Gordon Tetlow <gordon@FreeBSD.org>
Date: Tue, 28 Jan 2020 18:56:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r357218 - releng/12.0/sys/netipsec
X-SVN-Group: releng
X-SVN-Commit-Author: gordon
X-SVN-Commit-Paths: releng/12.0/sys/netipsec
X-SVN-Commit-Revision: 357218
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 &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Jan 2020 18:56:46 -0000

Author: gordon
Date: Tue Jan 28 18:56:46 2020
New Revision: 357218
URL: https://svnweb.freebsd.org/changeset/base/357218

Log:
  Fix missing IPsec anti-replay window check
  
  Reported by:	Jean-Francois HREN
  Approved by:	so
  Security:	FreeBSD-SA-20:02.ipsec
  Security:	CVE-2019-5613

Modified:
  releng/12.0/sys/netipsec/ipsec.c

Modified: releng/12.0/sys/netipsec/ipsec.c
==============================================================================
--- releng/12.0/sys/netipsec/ipsec.c	Tue Jan 28 18:55:25 2020	(r357217)
+++ releng/12.0/sys/netipsec/ipsec.c	Tue Jan 28 18:56:46 2020	(r357218)
@@ -1318,6 +1318,8 @@ ok:
 		    __func__, replay->overflow,
 		    ipsec_sa2str(sav, buf, sizeof(buf))));
 	}
+
+	replay->count++;
 	return (0);
 }