From owner-svn-src-stable@freebsd.org  Sat Apr  1 10:02:38 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 1399BD273FD;
 Sat,  1 Apr 2017 10:02:38 +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 D458B9C1;
 Sat,  1 Apr 2017 10:02:37 +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 v31A2adp075688;
 Sat, 1 Apr 2017 10:02:36 GMT (envelope-from ae@FreeBSD.org)
Received: (from ae@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v31A2asu075687;
 Sat, 1 Apr 2017 10:02:36 GMT (envelope-from ae@FreeBSD.org)
Message-Id: <201704011002.v31A2asu075687@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: Sat, 1 Apr 2017 10:02:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r316353 - stable/11/sys/netipsec
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Apr 2017 10:02:38 -0000

Author: ae
Date: Sat Apr  1 10:02:36 2017
New Revision: 316353
URL: https://svnweb.freebsd.org/changeset/base/316353

Log:
  MFC r316133:
    Fix bug in r308972 that leads to panic when non-compressed IPComp
    packet is received.
  
    Reported by:	Denis Ahrens <denis h3q com>

Modified:
  stable/11/sys/netipsec/key.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/netipsec/key.c
==============================================================================
--- stable/11/sys/netipsec/key.c	Sat Apr  1 09:37:15 2017	(r316352)
+++ stable/11/sys/netipsec/key.c	Sat Apr  1 10:02:36 2017	(r316353)
@@ -1041,9 +1041,9 @@ key_allocsa_tunnel(union sockaddr_union 
 			continue;
 		if (proto != sah->saidx.proto)
 			continue;
-		if (key_sockaddrcmp(&src->sa, &sav->sah->saidx.src.sa, 0) != 0)
+		if (key_sockaddrcmp(&src->sa, &sah->saidx.src.sa, 0) != 0)
 			continue;
-		if (key_sockaddrcmp(&dst->sa, &sav->sah->saidx.dst.sa, 0) != 0)
+		if (key_sockaddrcmp(&dst->sa, &sah->saidx.dst.sa, 0) != 0)
 			continue;
 		/* XXXAE: is key_preferred_oldsa reasonably?*/
 		if (V_key_preferred_oldsa)