summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason King <jason.king@joyent.com>2018-03-02 20:03:00 -0600
committerDan McDonald <danmcd@mnx.io>2022-11-14 13:31:13 -0500
commitcd434274bf9d8b5d054dee3415d2f1c28c33dd8f (patch)
treefba33b66ae833764814e27d0cad87889214a46b6
parent3580e26c24814e4d892b1eae539b8761388f79f1 (diff)
downloadillumos-joyent-cd434274bf9d8b5d054dee3415d2f1c28c33dd8f.tar.gz
15148 SADB_EXPIRE messages omit KMC extension
Reviewed by: Dan McDonald <danmcd@joyent.com> Reviewed by: Randy Fishel <randyf@sibernet.com> Approved by: Garrett D'Amore <garrett@damore.org>
-rw-r--r--usr/src/uts/common/inet/ip/sadb.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/usr/src/uts/common/inet/ip/sadb.c b/usr/src/uts/common/inet/ip/sadb.c
index 0ec9e2bcee..52d2348fcf 100644
--- a/usr/src/uts/common/inet/ip/sadb.c
+++ b/usr/src/uts/common/inet/ip/sadb.c
@@ -3774,7 +3774,8 @@ sadb_expire_assoc(queue_t *pfkey_q, ipsa_t *assoc)
}
alloclen = sizeof (*samsg) + sizeof (*current) + sizeof (*expire) +
- 2 * sizeof (sadb_address_t) + sizeof (*saext);
+ 2 * sizeof (sadb_address_t) + sizeof (*saext) +
+ sizeof (sadb_x_kmc_t);
af = assoc->ipsa_addrfam;
switch (af) {
@@ -3903,6 +3904,10 @@ sadb_expire_assoc(queue_t *pfkey_q, ipsa_t *assoc)
ASSERT(mp->b_wptr != NULL);
}
+ mp->b_wptr = sadb_make_kmc_ext(mp->b_wptr, end, assoc->ipsa_kmp,
+ assoc->ipsa_kmc);
+ ASSERT(mp->b_wptr != NULL);
+
/* Can just putnext, we're ready to go! */
putnext(pfkey_q, mp1);
}