From owner-svn-src-projects@freebsd.org Wed Dec 7 09:40:07 2016
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 58036C696B4
for <svn-src-projects@mailman.ysv.freebsd.org>;
Wed, 7 Dec 2016 09:40:07 +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 1CE096B4;
Wed, 7 Dec 2016 09:40:07 +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 uB79e6Gi081289;
Wed, 7 Dec 2016 09:40:06 GMT (envelope-from ae@FreeBSD.org)
Received: (from ae@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB79e6dx081288;
Wed, 7 Dec 2016 09:40:06 GMT (envelope-from ae@FreeBSD.org)
Message-Id: <201612070940.uB79e6dx081288@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, 7 Dec 2016 09:40:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r309672 - 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, 07 Dec 2016 09:40:07 -0000
Author: ae
Date: Wed Dec 7 09:40:06 2016
New Revision: 309672
URL: https://svnweb.freebsd.org/changeset/base/309672
Log:
Convert TCP header fields into network byte order only if we have SA.
Modified:
projects/ipsec/sys/netipsec/xform_tcp.c
Modified: projects/ipsec/sys/netipsec/xform_tcp.c
==============================================================================
--- projects/ipsec/sys/netipsec/xform_tcp.c Wed Dec 7 09:36:08 2016 (r309671)
+++ projects/ipsec/sys/netipsec/xform_tcp.c Wed Dec 7 09:40:06 2016 (r309672)
@@ -239,24 +239,23 @@ tcp_ipsec_input(struct mbuf *m, struct t
struct secasindex saidx;
struct secasvar *sav;
- /*
- * tcp_input() operates with TCP header fields in host
- * byte order. We expect them in network byte order.
- */
- tcp_fields_to_net(th);
ipsec_setsockaddrs(m, &saidx.src, &saidx.dst);
saidx.proto = IPPROTO_TCP;
saidx.mode = IPSEC_MODE_TCPMD5;
saidx.reqid = 0;
sav = key_allocsa_tcpmd5(&saidx);
if (sav == NULL) {
- tcp_fields_to_host(th);
KMOD_TCPSTAT_INC(tcps_sig_err_buildsig);
return (EACCES);
}
+ /*
+ * tcp_input() operates with TCP header fields in host
+ * byte order. We expect them in network byte order.
+ */
+ tcp_fields_to_net(th);
tcp_signature_compute(m, th, sav, tmpdigest);
- key_freesav(&sav);
tcp_fields_to_host(th);
+ key_freesav(&sav);
if (bcmp(buf, tmpdigest, TCP_SIGLEN) != 0) {
KMOD_TCPSTAT_INC(tcps_sig_rcvbadsig);
return (EACCES);