Mercurial > illumos > illumos-gate

changeset 10697:57a93d4f0d3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6887175 assertion failure in ipsec_tun_inbound/ipsec_check_global_policy
author Dan McDonald <danmcd@sun.com>
date Wed, 30 Sep 2009 19:35:43 -0400
parents cd0f390dd9e2
children 3ca3c489210e
files usr/src/uts/common/inet/iptun/iptun.c
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/common/inet/iptun/iptun.c	Wed Sep 30 13:40:27 2009 -0600
+++ b/usr/src/uts/common/inet/iptun/iptun.c	Wed Sep 30 19:35:43 2009 -0400
@@ -2647,8 +2647,9 @@
 			goto drop;
 	}
 
-	if (!ipsec_tun_inbound(mp, &data_mp, iptun->iptun_itp, inner4,
-	    inner6, outer4, outer6, outer_hlen, iptun->iptun_ns)) {
+	if (!ipsec_tun_inbound((mp == data_mp ? NULL : mp), &data_mp,
+	    iptun->iptun_itp, inner4, inner6, outer4, outer6, outer_hlen,
+	    iptun->iptun_ns)) {
 		/* Callee did all of the freeing. */
 		return;
 	}