From owner-svn-src-head@FreeBSD.ORG  Fri Jan 30 17:29:08 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E804A288;
 Fri, 30 Jan 2015 17:29:08 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 D43F8CC0;
 Fri, 30 Jan 2015 17:29:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0UHT8pB057522;
 Fri, 30 Jan 2015 17:29:08 GMT (envelope-from hiren@FreeBSD.org)
Received: (from hiren@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0UHT8S7057521;
 Fri, 30 Jan 2015 17:29:08 GMT (envelope-from hiren@FreeBSD.org)
Message-Id: <201501301729.t0UHT8S7057521@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: hiren set sender to
 hiren@FreeBSD.org using -f
From: Hiren Panchasara <hiren@FreeBSD.org>
Date: Fri, 30 Jan 2015 17:29:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r277938 - head/sys/netinet
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Jan 2015 17:29:09 -0000

Author: hiren
Date: Fri Jan 30 17:29:07 2015
New Revision: 277938
URL: https://svnweb.freebsd.org/changeset/base/277938

Log:
  Make syncookie_mac() use 'tcp_seq irs' in computing hash.
  This fixes what seems like a simple oversight when the function was added in
  r253210.
  
  Reported by:            Daniel Borkmann <dborkman@redhat.com>
                          Florian Westphal <fw@strlen.de>
  Differential Revision:  https://reviews.freebsd.org/D1628
  Reviewed by:            gnn
  MFC after:              1 month
  Sponsored by:           Limelight Networks

Modified:
  head/sys/netinet/tcp_syncache.c

Modified: head/sys/netinet/tcp_syncache.c
==============================================================================
--- head/sys/netinet/tcp_syncache.c	Fri Jan 30 15:42:52 2015	(r277937)
+++ head/sys/netinet/tcp_syncache.c	Fri Jan 30 17:29:07 2015	(r277938)
@@ -1742,6 +1742,7 @@ syncookie_mac(struct in_conninfo *inc, t
 	}
 	SipHash_Update(&ctx, &inc->inc_fport, sizeof(inc->inc_fport));
 	SipHash_Update(&ctx, &inc->inc_lport, sizeof(inc->inc_lport));
+	SipHash_Update(&ctx, &irs, sizeof(irs));
 	SipHash_Update(&ctx, &flags, sizeof(flags));
 	SipHash_Update(&ctx, &secmod, sizeof(secmod));
 	SipHash_Final((u_int8_t *)&siphash, &ctx);