From owner-svn-src-projects@freebsd.org Wed Feb 1 19:36:34 2017
Return-Path: <owner-svn-src-projects@freebsd.org>
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 6FB9ACCC6F2
for <svn-src-projects@mailman.ysv.freebsd.org>;
Wed, 1 Feb 2017 19:36:34 +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 3FAAE1450;
Wed, 1 Feb 2017 19:36:34 +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 v11JaXLh044605;
Wed, 1 Feb 2017 19:36:33 GMT (envelope-from ae@FreeBSD.org)
Received: (from ae@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id v11JaXrK044604;
Wed, 1 Feb 2017 19:36:33 GMT (envelope-from ae@FreeBSD.org)
Message-Id: <201702011936.v11JaXrK044604@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org
using -f
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Wed, 1 Feb 2017 19:36:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r313046 - 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" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Feb 2017 19:36:34 -0000
Author: ae
Date: Wed Feb 1 19:36:33 2017
New Revision: 313046
URL: https://svnweb.freebsd.org/changeset/base/313046
Log:
Fix out of bounds of the requests array due to wrong check.
Modified:
projects/ipsec/sys/netipsec/ipsec_output.c
Modified: projects/ipsec/sys/netipsec/ipsec_output.c
==============================================================================
--- projects/ipsec/sys/netipsec/ipsec_output.c Wed Feb 1 19:33:00 2017 (r313045)
+++ projects/ipsec/sys/netipsec/ipsec_output.c Wed Feb 1 19:36:33 2017 (r313046)
@@ -167,10 +167,8 @@ next:
* IPsec processing, i.e. return EJUSTRETURN.
* But first check if there is some bundled transform.
*/
- if (sp->tcount > (*pidx)) {
- (*pidx)++;
+ if (sp->tcount > ++(*pidx))
goto next;
- }
*error = EJUSTRETURN;
}
return (NULL);
@@ -487,10 +485,8 @@ next:
* IPsec processing, i.e. return EJUSTRETURN.
* But first check if there is some bundled transform.
*/
- if (sp->tcount > (*pidx)) {
- (*pidx)++;
+ if (sp->tcount > ++(*pidx))
goto next;
- }
*error = EJUSTRETURN;
}
return (NULL);