summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorDan McDonald <danmcd@sun.com>2009-05-08 15:23:50 -0400
committerDan McDonald <danmcd@sun.com>2009-05-08 15:23:50 -0400
commit67630a58010cadac58370eef9d7b5dde9e2ab3e4 (patch)
treed8bce606cb58da5595021d7a3ce76522904e4fdc /usr/src
parent340050d5612a87798abda8747778267e49e77898 (diff)
downloadillumos-joyent-67630a58010cadac58370eef9d7b5dde9e2ab3e4.tar.gz
6811934 panic in ipsec_out_zoneid: ../../common/inet/ip/ip.c, line: 3315
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/uts/common/inet/ip/ip.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/usr/src/uts/common/inet/ip/ip.c b/usr/src/uts/common/inet/ip/ip.c
index a231f1a4f0..ae5075f13f 100644
--- a/usr/src/uts/common/inet/ip/ip.c
+++ b/usr/src/uts/common/inet/ip/ip.c
@@ -3303,8 +3303,12 @@ icmp_pkt(queue_t *q, mblk_t *mp, void *stuff, size_t len,
*/
io->ipsec_out_proc_begin = B_FALSE;
}
- ASSERT(zoneid == io->ipsec_out_zoneid);
ASSERT(zoneid != ALL_ZONES);
+ /*
+ * The IPSEC_IN (now an IPSEC_OUT) didn't have its zoneid
+ * initialized. We need to do that now.
+ */
+ io->ipsec_out_zoneid = zoneid;
} else {
/*
* This is in clear. The icmp message we are building