summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/inet/ip/icmp.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/uts/common/inet/ip/icmp.c')
-rw-r--r--usr/src/uts/common/inet/ip/icmp.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/usr/src/uts/common/inet/ip/icmp.c b/usr/src/uts/common/inet/ip/icmp.c
index bfae1cd136..e8e8c0a7c5 100644
--- a/usr/src/uts/common/inet/ip/icmp.c
+++ b/usr/src/uts/common/inet/ip/icmp.c
@@ -729,6 +729,7 @@ icmp_close_free(conn_t *connp)
if (icmp->icmp_ip_snd_options != NULL) {
mi_free((char *)icmp->icmp_ip_snd_options);
icmp->icmp_ip_snd_options = NULL;
+ icmp->icmp_ip_snd_options_len = 0;
}
if (icmp->icmp_filter != NULL) {
@@ -743,6 +744,16 @@ icmp_close_free(conn_t *connp)
icmp->icmp_sticky_hdrs_len = 0;
}
ip6_pkt_free(&icmp->icmp_sticky_ipp);
+
+ /*
+ * Clear any fields which the kmem_cache constructor clears.
+ * Only icmp_connp needs to be preserved.
+ * TBD: We should make this more efficient to avoid clearing
+ * everything.
+ */
+ ASSERT(icmp->icmp_connp == connp);
+ bzero(icmp, sizeof (icmp_t));
+ icmp->icmp_connp = connp;
}
static int