#include <netinet/ip.h>
#include <netinet/in_var.h>
-#if INET6
#include <netinet/ip6.h>
#include <netinet6/in6_var.h>
#include <netinet6/ip6_var.h>
-#endif /* INET6 */
#include <net/pfkeyv2.h>
#include <netkey/keydb.h>
#include <libkern/crypto/rand.h>
#include <netinet6/ipsec.h>
-#if INET6
#include <netinet6/ipsec6.h>
-#endif
#include <netinet6/ah.h>
-#if INET6
#include <netinet6/ah6.h>
-#endif
#if IPSEC_ESP
#include <netinet6/esp.h>
-#if INET6
#include <netinet6/esp6.h>
#endif
-#endif
/* randomness */
static int key_do_get_translated_port(struct secashead *, struct secasvar *, u_int);
static void key_delsp(struct secpolicy *);
static struct secpolicy *key_getsp(struct secpolicyindex *);
-static u_int32_t key_newreqid(void);
+static u_int16_t key_newreqid(void);
static struct mbuf *key_gather_mbuf(struct mbuf *,
const struct sadb_msghdr *, int, int, int *);
static int key_spdadd(struct socket *, struct mbuf *,
u_int32_t, pid_t, u_int16_t);
static struct mbuf *key_setsadbsa(struct secasvar *);
static struct mbuf *key_setsadbaddr(u_int16_t,
- struct sockaddr *, u_int8_t, u_int16_t);
-static struct mbuf *key_setsadbipsecif(ifnet_t, ifnet_t, ifnet_t, int);
-#if 0
-static struct mbuf *key_setsadbident(u_int16_t, u_int16_t, caddr_t,
- int, u_int64_t);
-#endif
+ struct sockaddr *, size_t, u_int8_t);
+static struct mbuf *key_setsadbipsecif(ifnet_t, ifnet_t, ifnet_t, u_int8_t);
static struct mbuf *key_setsadbxsa2(u_int8_t, u_int32_t, u_int32_t, u_int16_t);
static struct mbuf *key_setsadbxpolicy(u_int16_t, u_int8_t,
u_int32_t);
static void *key_newbuf(const void *, u_int);
-#if INET6
static int key_ismyaddr6(struct sockaddr_in6 *);
-#endif
static void key_update_natt_keepalive_timestamp(struct secasvar *, struct secasvar *);
/* flags for key_cmpsaidx() */
static int key_is_addr_in_range(struct sockaddr_storage *, struct secpolicyaddrrange *);
static int key_bbcmp(caddr_t, caddr_t, u_int);
static void key_srandom(void);
-static u_int16_t key_satype2proto(u_int8_t);
+static u_int8_t key_satype2proto(u_int8_t);
static u_int8_t key_proto2satype(u_int16_t);
static int key_getspi(struct socket *, struct mbuf *,
static int key_update(struct socket *, struct mbuf *,
const struct sadb_msghdr *);
static int key_add(struct socket *, struct mbuf *, const struct sadb_msghdr *);
-static int key_setident(struct secashead *, struct mbuf *,
- const struct sadb_msghdr *);
static struct mbuf *key_getmsgbuf_x1(struct mbuf *, const struct sadb_msghdr *);
static int key_delete(struct socket *, struct mbuf *,
const struct sadb_msghdr *);
static struct mbuf *key_alloc_mbuf(int);
static int key_getsastat(struct socket *, struct mbuf *, const struct sadb_msghdr *);
static int key_migrate(struct socket *, struct mbuf *, const struct sadb_msghdr *);
-static int key_setsaval2(struct secasvar *sav,
- u_int8_t satype,
- u_int8_t alg_auth,
- u_int8_t alg_enc,
- u_int32_t flags,
- u_int8_t replay,
- struct sadb_key *key_auth,
- u_int16_t key_auth_len,
- struct sadb_key *key_enc,
- u_int16_t key_enc_len,
- u_int16_t natt_port,
- u_int32_t seq,
- u_int32_t spi,
- u_int32_t pid,
- struct sadb_lifetime *lifetime_hard,
- struct sadb_lifetime *lifetime_soft);
static void bzero_keys(const struct sadb_msghdr *);
extern int ipsec_bypass;
ip4_def_policy.policy = IPSEC_POLICY_NONE;
ip4_def_policy.refcnt++; /*never reclaim this*/
#endif
-#if INET6
ip6_def_policy.policy = IPSEC_POLICY_NONE;
ip6_def_policy.refcnt++; /*never reclaim this*/
-#endif
key_timehandler_running = 0;
}
m = key_setsadbmsg(SADB_DELETE, 0,
- satype, 0, 0, sav->refcnt - 1);
+ satype, 0, 0, (u_int16_t)(sav->refcnt - 1));
if (!m) {
goto msgfail;
}
for (m = result; m; m = m->m_next) {
result->m_pkthdr.len += m->m_len;
}
+
+ VERIFY(PFKEY_UNIT64(result->m_pkthdr.len) <= UINT16_MAX);
mtod(result, struct sadb_msg *)->sadb_msg_len =
- PFKEY_UNIT64(result->m_pkthdr.len);
+ (u_int16_t)PFKEY_UNIT64(result->m_pkthdr.len);
if (key_sendup_mbuf(NULL, result,
KEY_SENDUP_REGISTERED)) {
continue;
}
-#if 0 /* don't check src */
- /* check src address */
- switch (family) {
- case AF_INET:
- bzero(&sin, sizeof(sin));
- sin.sin_family = AF_INET;
- sin.sin_len = sizeof(sin);
- bcopy(src, &sin.sin_addr,
- sizeof(sin.sin_addr));
- if (key_sockaddrcmp((struct sockaddr*)&sin,
- (struct sockaddr *)&sav->sah->saidx.src, 0) != 0) {
- continue;
- }
- break;
- case AF_INET6:
- bzero(&sin6, sizeof(sin6));
- sin6.sin6_family = AF_INET6;
- sin6.sin6_len = sizeof(sin6);
- bcopy(src, &sin6.sin6_addr,
- sizeof(sin6.sin6_addr));
- if (IN6_IS_SCOPE_LINKLOCAL(&sin6.sin6_addr)) {
- /* kame fake scopeid */
- sin6.sin6_scope_id =
- ntohs(sin6.sin6_addr.s6_addr16[1]);
- sin6.sin6_addr.s6_addr16[1] = 0;
- }
- if (key_sockaddrcmp((struct sockaddr*)&sin6,
- (struct sockaddr *)&sav->sah->saidx.src, 0) != 0) {
- continue;
- }
- break;
- default:
- ipseclog((LOG_DEBUG, "key_allocsa: "
- "unknown address family=%d.\n",
- family));
- continue;
- }
-
-#endif
/* check dst address */
switch (family) {
case AF_INET:
/* allocate new reqid id if reqid is zero. */
if (xisr->sadb_x_ipsecrequest_reqid == 0) {
- u_int32_t reqid;
+ u_int16_t reqid;
if ((reqid = key_newreqid()) == 0) {
key_freesp(newsp, KEY_SADB_UNLOCKED);
*error = ENOBUFS;
return newsp;
}
-static u_int32_t
+static u_int16_t
key_newreqid(void)
{
lck_mtx_lock(sadb_mutex);
- static u_int32_t auto_reqid = IPSEC_MANUAL_REQID_MAX + 1;
+ static u_int16_t auto_reqid = IPSEC_MANUAL_REQID_MAX + 1;
int done = 0;
/* The reqid must be limited to 16 bits because the PF_KEY message format only uses
struct secpolicy *sp)
{
struct sadb_x_policy *xpl;
- int tlen;
+ u_int tlen;
caddr_t p;
struct mbuf *m;
}
tlen = key_getspreqmsglen(sp);
+ if (PFKEY_UNIT64(tlen) > UINT16_MAX) {
+ ipseclog((LOG_ERR, "key_getspreqmsglen returned length %u\n",
+ tlen));
+ return NULL;
+ }
m = key_alloc_mbuf(tlen);
if (!m || m->m_next) { /*XXX*/
xpl = mtod(m, struct sadb_x_policy *);
bzero(xpl, tlen);
- xpl->sadb_x_policy_len = PFKEY_UNIT64(tlen);
+ xpl->sadb_x_policy_len = (u_int16_t)PFKEY_UNIT64(tlen);
xpl->sadb_x_policy_exttype = SADB_X_EXT_POLICY;
- xpl->sadb_x_policy_type = sp->policy;
+ xpl->sadb_x_policy_type = (u_int16_t)sp->policy;
xpl->sadb_x_policy_dir = sp->spidx.dir;
xpl->sadb_x_policy_id = sp->id;
p = (caddr_t)xpl + sizeof(*xpl);
xisr->sadb_x_ipsecrequest_proto = isr->saidx.proto;
xisr->sadb_x_ipsecrequest_mode = isr->saidx.mode;
- xisr->sadb_x_ipsecrequest_level = isr->level;
- xisr->sadb_x_ipsecrequest_reqid = isr->saidx.reqid;
+ xisr->sadb_x_ipsecrequest_level = (u_int8_t)isr->level;
+ xisr->sadb_x_ipsecrequest_reqid = (u_int16_t)isr->saidx.reqid;
p += sizeof(*xisr);
bcopy(&isr->saidx.src, p, isr->saidx.src.ss_len);
microtime(&tv);
newsp->created = tv.tv_sec;
newsp->lastused = tv.tv_sec;
- newsp->lifetime = lft ? lft->sadb_lifetime_addtime : 0;
- newsp->validtime = lft ? lft->sadb_lifetime_usetime : 0;
+ newsp->lifetime = (long)(lft ? lft->sadb_lifetime_addtime : 0);
+ newsp->validtime = (long)(lft ? lft->sadb_lifetime_usetime : 0);
if (outgoing_if != NULL) {
ifnet_find_by_name(outgoing_if, &newsp->outgoing_if);
}
newmsg = mtod(n, struct sadb_msg *);
newmsg->sadb_msg_errno = 0;
- newmsg->sadb_msg_len = PFKEY_UNIT64(n->m_pkthdr.len);
+
+ VERIFY(PFKEY_UNIT64(n->m_pkthdr.len) <= UINT16_MAX);
+ newmsg->sadb_msg_len = (u_int16_t)PFKEY_UNIT64(n->m_pkthdr.len);
off = 0;
mpolicy = m_pulldown(n, PFKEY_ALIGN8(sizeof(struct sadb_msg)),
newmsg = mtod(n, struct sadb_msg *);
newmsg->sadb_msg_errno = 0;
- newmsg->sadb_msg_len = PFKEY_UNIT64(n->m_pkthdr.len);
+ VERIFY(PFKEY_UNIT64(n->m_pkthdr.len) <= UINT16_MAX);
+ newmsg->sadb_msg_len = (u_int16_t)PFKEY_UNIT64(n->m_pkthdr.len);
m_freem(m);
return key_sendup_mbuf(so, n, KEY_SENDUP_ALL);
newmsg = mtod(n, struct sadb_msg *);
newmsg->sadb_msg_errno = 0;
- newmsg->sadb_msg_len = PFKEY_UNIT64(n->m_pkthdr.len);
+ VERIFY(PFKEY_UNIT64(n->m_pkthdr.len) <= UINT16_MAX);
+ newmsg->sadb_msg_len = (u_int16_t)PFKEY_UNIT64(n->m_pkthdr.len);
m_freem(m);
return key_sendup_mbuf(so, n, KEY_SENDUP_ALL);
}
newmsg = mtod(n, struct sadb_msg *);
newmsg->sadb_msg_errno = 0;
- newmsg->sadb_msg_len = PFKEY_UNIT64(n->m_pkthdr.len);
+ VERIFY(PFKEY_UNIT64(n->m_pkthdr.len) <= UINT16_MAX);
+ newmsg->sadb_msg_len = (u_int16_t)PFKEY_UNIT64(n->m_pkthdr.len);
m_freem(m);
return key_sendup_mbuf(so, n, KEY_SENDUP_ALL);
}
newmsg = mtod(n, struct sadb_msg *);
newmsg->sadb_msg_errno = 0;
- newmsg->sadb_msg_len = PFKEY_UNIT64(n->m_pkthdr.len);
+ VERIFY(PFKEY_UNIT64(n->m_pkthdr.len) <= UINT16_MAX);
+ newmsg->sadb_msg_len = (u_int16_t)PFKEY_UNIT64(n->m_pkthdr.len);
m_freem(m);
return key_sendup_mbuf(so, n, KEY_SENDUP_ALL);
/* get a entry to check whether sent message or not. */
lck_mtx_lock(sadb_mutex);
+ sp->refcnt++;
if ((newspacq = key_getspacq(&sp->spidx)) != NULL) {
+ key_freesp(sp, KEY_SADB_LOCKED);
if (key_blockacq_count < newspacq->count) {
/* reset counter and do send message. */
newspacq->count = 0;
} else {
/* make new entry for blocking to send SADB_ACQUIRE. */
if ((newspacq = key_newspacq(&sp->spidx)) == NULL) {
+ key_freesp(sp, KEY_SADB_LOCKED);
lck_mtx_unlock(sadb_mutex);
return ENOBUFS;
}
+ key_freesp(sp, KEY_SADB_LOCKED);
/* add to acqtree */
LIST_INSERT_HEAD(&spacqtree, newspacq, chain);
key_start_timehandler();
result->m_pkthdr.len += m->m_len;
}
+ VERIFY(PFKEY_UNIT64(result->m_pkthdr.len) <= UINT16_MAX);
mtod(result, struct sadb_msg *)->sadb_msg_len =
- PFKEY_UNIT64(result->m_pkthdr.len);
+ (u_int16_t)PFKEY_UNIT64(result->m_pkthdr.len);
return key_sendup_mbuf(NULL, m, KEY_SENDUP_REGISTERED);
m->m_pkthdr.len = m->m_len = PFKEY_ALIGN8(sizeof(struct sadb_msg));
newmsg = mtod(m, struct sadb_msg *);
newmsg->sadb_msg_errno = 0;
- newmsg->sadb_msg_len = PFKEY_UNIT64(m->m_pkthdr.len);
+ newmsg->sadb_msg_len = (u_int16_t)PFKEY_UNIT64(m->m_pkthdr.len);
return key_sendup_mbuf(so, m, KEY_SENDUP_ALL);
}
static struct mbuf *
key_setdumpsp(
struct secpolicy *sp,
- u_int8_t type,
+ u_int8_t msg_type,
u_int32_t seq,
u_int32_t pid)
{
struct mbuf *result = NULL, *m;
- m = key_setsadbmsg(type, 0, SADB_SATYPE_UNSPEC, seq, pid, sp->refcnt);
+ m = key_setsadbmsg(msg_type, 0, SADB_SATYPE_UNSPEC, seq, pid, (u_int16_t)sp->refcnt);
if (!m) {
goto fail;
}
result->m_pkthdr.len += m->m_len;
}
+ if (PFKEY_UNIT64(result->m_pkthdr.len) >= UINT16_MAX) {
+ ipseclog((LOG_DEBUG, "key_setdumpsp: packet header length > UINT16_MAX\n"));
+ goto fail;
+ }
+
mtod(result, struct sadb_msg *)->sadb_msg_len =
- PFKEY_UNIT64(result->m_pkthdr.len);
+ (u_int16_t)PFKEY_UNIT64(result->m_pkthdr.len);
return result;
result->m_pkthdr.len += m->m_len;
}
+ if (PFKEY_UNIT64(result->m_pkthdr.len) >= UINT16_MAX) {
+ ipseclog((LOG_DEBUG, "key_setdumpsp: packet header length > UINT16_MAX\n"));
+ goto fail;
+ }
+
mtod(result, struct sadb_msg *)->sadb_msg_len =
- PFKEY_UNIT64(result->m_pkthdr.len);
+ (u_int16_t)PFKEY_UNIT64(result->m_pkthdr.len);
return key_sendup_mbuf(NULL, result, KEY_SENDUP_REGISTERED);
panic("key_delsah: NULL pointer is passed.\n");
}
+ if (sah->use_count > 0) {
+ return;
+ }
+
/* searching all SA registerd in the secindex. */
for (stateidx = 0;
stateidx < _ARRAYLEN(saorder_state_any);
sah->ipsec_if = NULL;
}
- if (sah->idents) {
- KFREE(sah->idents);
- }
-
- if (sah->identd) {
- KFREE(sah->identd);
- }
-
/* remove from tree of SA index */
if (__LIST_CHAINED(sah)) {
LIST_REMOVE(sah, chain);
return newsav;
}
-/*
- * allocating a new SA with LARVAL state. key_add() and key_getspi() call,
- * and copy the values passed into new buffer.
- * When SAD message type is GETSPI:
- * to set sequence number from acq_seq++,
- * to set zero to SPI.
- * not to call key_setsava().
- * OUT: NULL : fail
- * others : pointer to new secasvar.
- */
-struct secasvar *
-key_newsav2(struct secashead *sah,
- u_int8_t satype,
- u_int8_t alg_auth,
- u_int8_t alg_enc,
- u_int32_t flags,
- u_int8_t replay,
- struct sadb_key *key_auth,
- u_int16_t key_auth_len,
- struct sadb_key *key_enc,
- u_int16_t key_enc_len,
- u_int16_t natt_port,
- u_int32_t seq,
- u_int32_t spi,
- u_int32_t pid,
- struct sadb_lifetime *lifetime_hard,
- struct sadb_lifetime *lifetime_soft)
-{
- struct secasvar *newsav;
-
- LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED);
-
- /* sanity check */
- if (sah == NULL) {
- panic("key_newsa: NULL pointer is passed.\n");
- }
-
- KMALLOC_NOWAIT(newsav, struct secasvar *, sizeof(struct secasvar));
- if (newsav == NULL) {
- lck_mtx_unlock(sadb_mutex);
- KMALLOC_WAIT(newsav, struct secasvar *, sizeof(struct secasvar));
- lck_mtx_lock(sadb_mutex);
- if (newsav == NULL) {
- ipseclog((LOG_DEBUG, "key_newsa: No more memory.\n"));
- return NULL;
- }
- }
- bzero((caddr_t)newsav, sizeof(struct secasvar));
-
- newsav->seq = seq;
- key_setspi(newsav, spi);
-
- if (key_setsaval2(newsav,
- satype,
- alg_auth,
- alg_enc,
- flags,
- replay,
- key_auth,
- key_auth_len,
- key_enc,
- key_enc_len,
- natt_port,
- seq,
- spi,
- pid,
- lifetime_hard,
- lifetime_soft)) {
- key_delsav(newsav);
- return NULL;
- }
-
- /* reset created */
- {
- struct timeval tv;
- microtime(&tv);
- newsav->created = tv.tv_sec;
- }
-
- newsav->pid = pid;
-
- /* add to satree */
- newsav->sah = sah;
- newsav->refcnt = 1;
- if (spi && key_auth && key_auth_len && key_enc && key_enc_len) {
- newsav->state = SADB_SASTATE_MATURE;
- LIST_INSERT_TAIL(&sah->savtree[SADB_SASTATE_MATURE], newsav,
- secasvar, chain);
- } else {
- newsav->state = SADB_SASTATE_LARVAL;
- LIST_INSERT_TAIL(&sah->savtree[SADB_SASTATE_LARVAL], newsav,
- secasvar, chain);
- }
- ipsec_sav_count++;
-
- return newsav;
-}
-
static int
key_migratesav(struct secasvar *sav,
struct secashead *newsah)
return 0;
}
-/*
- * free() SA variable entry.
- */
-void
-key_delsav(
- struct secasvar *sav)
+static void
+key_reset_sav(struct secasvar *sav)
{
LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED);
panic("key_delsav: NULL pointer is passed.\n");
}
- if (sav->refcnt > 0) {
- return; /* can't free */
- }
- /* remove from SA header */
- if (__LIST_CHAINED(sav)) {
- LIST_REMOVE(sav, chain);
- ipsec_sav_count--;
- }
-
- if (sav->spihash.le_prev || sav->spihash.le_next) {
- LIST_REMOVE(sav, spihash);
- }
+ sav->remote_ike_port = 0;
+ sav->natt_encapsulated_src_port = 0;
if (sav->key_auth != NULL) {
bzero(_KEYBUF(sav->key_auth), _KEYLEN(sav->key_auth));
bzero(sav->sched, sav->schedlen);
KFREE(sav->sched);
sav->sched = NULL;
+ sav->schedlen = 0;
}
for (int i = 0; i < MAX_REPLAY_WINDOWS; i++) {
sav->iv = NULL;
}
+ return;
+}
+
+/*
+ * free() SA variable entry.
+ */
+void
+key_delsav(
+ struct secasvar *sav)
+{
+ LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED);
+
+ /* sanity check */
+ if (sav == NULL) {
+ panic("key_delsav: NULL pointer is passed.\n");
+ }
+
+ if (sav->refcnt > 0) {
+ return; /* can't free */
+ }
+ /* remove from SA header */
+ if (__LIST_CHAINED(sav)) {
+ LIST_REMOVE(sav, chain);
+ ipsec_sav_count--;
+ }
+
+ if (sav->spihash.le_prev || sav->spihash.le_next) {
+ LIST_REMOVE(sav, spihash);
+ }
+
+ key_reset_sav(sav);
+
KFREE(sav);
return;
}
/* initialization */
- for (int i = 0; i < MAX_REPLAY_WINDOWS; i++) {
- sav->replay[i] = NULL;
- }
- sav->key_auth = NULL;
- sav->key_enc = NULL;
- sav->sched = NULL;
- sav->schedlen = 0;
- sav->iv = NULL;
- sav->lft_c = NULL;
- sav->lft_h = NULL;
- sav->lft_s = NULL;
- sav->remote_ike_port = 0;
+ key_reset_sav(sav);
sav->natt_last_activity = natt_now;
- sav->natt_encapsulated_src_port = 0;
/* SA */
if (mhp->ext[SADB_EXT_SA] != NULL) {
return 0;
fail:
- /* initialization */
- for (int i = 0; i < MAX_REPLAY_WINDOWS; i++) {
- if (sav->replay[i] != NULL) {
- keydb_delsecreplay(sav->replay[i]);
- sav->replay[i] = NULL;
- }
- }
- if (sav->key_auth != NULL) {
- bzero(_KEYBUF(sav->key_auth), _KEYLEN(sav->key_auth));
- KFREE(sav->key_auth);
- sav->key_auth = NULL;
- }
- if (sav->key_enc != NULL) {
- bzero(_KEYBUF(sav->key_enc), _KEYLEN(sav->key_enc));
- KFREE(sav->key_enc);
- sav->key_enc = NULL;
- }
- if (sav->sched) {
- bzero(sav->sched, sav->schedlen);
- KFREE(sav->sched);
- sav->sched = NULL;
- }
- if (sav->iv != NULL) {
- KFREE(sav->iv);
- sav->iv = NULL;
- }
- if (sav->lft_c != NULL) {
- KFREE(sav->lft_c);
- sav->lft_c = NULL;
- }
- if (sav->lft_h != NULL) {
- KFREE(sav->lft_h);
- sav->lft_h = NULL;
- }
- if (sav->lft_s != NULL) {
- KFREE(sav->lft_s);
- sav->lft_s = NULL;
- }
-
- return error;
-}
-
-/*
- * copy SA values from PF_KEY message except *SPI, SEQ, PID, STATE and TYPE*.
- * You must update these if need.
- * OUT: 0: success.
- * !0: failure.
- *
- * does not modify mbuf. does not free mbuf on error.
- */
-int
-key_setsaval2(struct secasvar *sav,
- u_int8_t satype,
- u_int8_t alg_auth,
- u_int8_t alg_enc,
- u_int32_t flags,
- u_int8_t replay,
- struct sadb_key *key_auth,
- u_int16_t key_auth_len,
- struct sadb_key *key_enc,
- u_int16_t key_enc_len,
- u_int16_t natt_port,
- u_int32_t seq,
- u_int32_t spi,
- u_int32_t pid,
- struct sadb_lifetime *lifetime_hard,
- struct sadb_lifetime *lifetime_soft)
-{
-#if IPSEC_ESP
- const struct esp_algorithm *algo;
-#endif
- int error = 0;
- struct timeval tv;
-
- LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED);
-
- /* initialization */
- for (int i = 0; i < MAX_REPLAY_WINDOWS; i++) {
- sav->replay[i] = NULL;
- }
-
- sav->key_auth = NULL;
- sav->key_enc = NULL;
- sav->sched = NULL;
- sav->schedlen = 0;
- sav->iv = NULL;
- sav->lft_c = NULL;
- sav->lft_h = NULL;
- sav->lft_s = NULL;
- sav->remote_ike_port = 0;
- sav->natt_last_activity = natt_now;
- sav->natt_encapsulated_src_port = 0;
-
- sav->alg_auth = alg_auth;
- sav->alg_enc = alg_enc;
- sav->flags = flags;
- sav->pid = pid;
- sav->seq = seq;
- key_setspi(sav, htonl(spi));
-
- /*
- * Verify that a nat-traversal port was specified if
- * the nat-traversal flag is set.
- */
- if ((sav->flags & SADB_X_EXT_NATT) != 0) {
- if (natt_port == 0) {
- ipseclog((LOG_DEBUG, "key_setsaval2: natt port not set.\n"));
- error = EINVAL;
- goto fail;
- }
- sav->remote_ike_port = natt_port;
- }
-
- /*
- * Verify if SADB_X_EXT_NATT_MULTIPLEUSERS flag is set that
- * SADB_X_EXT_NATT is set and SADB_X_EXT_NATT_KEEPALIVE is not
- * set (we're not behind nat) - otherwise clear it.
- */
- if ((sav->flags & SADB_X_EXT_NATT_MULTIPLEUSERS) != 0) {
- if ((sav->flags & SADB_X_EXT_NATT) == 0 ||
- (sav->flags & SADB_X_EXT_NATT_KEEPALIVE) != 0) {
- sav->flags &= ~SADB_X_EXT_NATT_MULTIPLEUSERS;
- }
- }
-
- /* replay window */
- if ((flags & SADB_X_EXT_OLD) == 0) {
- if ((sav->flags2 & SADB_X_EXT_SA2_SEQ_PER_TRAFFIC_CLASS) ==
- SADB_X_EXT_SA2_SEQ_PER_TRAFFIC_CLASS) {
- uint32_t range = (1ULL << (sizeof(((struct secreplay *)0)->count) * 8)) / MAX_REPLAY_WINDOWS;
- for (int i = 0; i < MAX_REPLAY_WINDOWS; i++) {
- sav->replay[i] = keydb_newsecreplay(replay);
- if (sav->replay[i] == NULL) {
- ipseclog((LOG_DEBUG, "key_setsaval: No more memory.\n"));
- error = ENOBUFS;
- goto fail;
- }
- /* Allowed range for sequence per traffic class */
- sav->replay[i]->count = i * range;
- sav->replay[i]->lastseq = ((i + 1) * range) - 1;
- }
- } else {
- sav->replay[0] = keydb_newsecreplay(replay);
- if (sav->replay[0] == NULL) {
- ipseclog((LOG_DEBUG, "key_setsaval: No more memory.\n"));
- error = ENOBUFS;
- goto fail;
- }
- sav->replay[0]->lastseq = ~0;
- }
- }
-
- /* Authentication keys */
- sav->key_auth = (__typeof__(sav->key_auth))key_newbuf(key_auth, key_auth_len);
- if (sav->key_auth == NULL) {
- ipseclog((LOG_DEBUG, "key_setsaval: No more memory.\n"));
- error = ENOBUFS;
- goto fail;
- }
-
- /* Encryption key */
- sav->key_enc = (__typeof__(sav->key_enc))key_newbuf(key_enc, key_enc_len);
- if (sav->key_enc == NULL) {
- ipseclog((LOG_DEBUG, "key_setsaval: No more memory.\n"));
- error = ENOBUFS;
- goto fail;
- }
-
- /* set iv */
- sav->ivlen = 0;
-
- if (satype == SADB_SATYPE_ESP) {
-#if IPSEC_ESP
- algo = esp_algorithm_lookup(sav->alg_enc);
- if (algo && algo->ivlen) {
- sav->ivlen = (*algo->ivlen)(algo, sav);
- }
- if (sav->ivlen != 0) {
- KMALLOC_NOWAIT(sav->iv, caddr_t, sav->ivlen);
- if (sav->iv == 0) {
- lck_mtx_unlock(sadb_mutex);
- KMALLOC_WAIT(sav->iv, caddr_t, sav->ivlen);
- lck_mtx_lock(sadb_mutex);
- if (sav->iv == 0) {
- ipseclog((LOG_DEBUG, "key_setsaval: No more memory.\n"));
- error = ENOBUFS;
- goto fail;
- }
- }
- /* initialize */
- if (sav->alg_enc == SADB_X_EALG_AES_GCM) {
- bzero(sav->iv, sav->ivlen);
- } else {
- key_randomfill(sav->iv, sav->ivlen);
- }
- }
-#endif
- }
-
- /* reset created */
- microtime(&tv);
- sav->created = tv.tv_sec;
-
- /* make lifetime for CURRENT */
- KMALLOC_NOWAIT(sav->lft_c, struct sadb_lifetime *,
- sizeof(struct sadb_lifetime));
- if (sav->lft_c == NULL) {
- lck_mtx_unlock(sadb_mutex);
- KMALLOC_WAIT(sav->lft_c, struct sadb_lifetime *,
- sizeof(struct sadb_lifetime));
- lck_mtx_lock(sadb_mutex);
- if (sav->lft_c == NULL) {
- ipseclog((LOG_DEBUG, "key_setsaval: No more memory.\n"));
- error = ENOBUFS;
- goto fail;
- }
- }
-
- microtime(&tv);
-
- sav->lft_c->sadb_lifetime_len =
- PFKEY_UNIT64(sizeof(struct sadb_lifetime));
- sav->lft_c->sadb_lifetime_exttype = SADB_EXT_LIFETIME_CURRENT;
- sav->lft_c->sadb_lifetime_allocations = 0;
- sav->lft_c->sadb_lifetime_bytes = 0;
- sav->lft_c->sadb_lifetime_addtime = tv.tv_sec;
- sav->lft_c->sadb_lifetime_usetime = 0;
-
- /* lifetimes for HARD and SOFT */
- sav->lft_h = (__typeof__(sav->lft_h))key_newbuf(lifetime_hard,
- sizeof(*lifetime_hard));
- if (sav->lft_h == NULL) {
- ipseclog((LOG_DEBUG, "key_setsaval: No more memory.\n"));
- error = ENOBUFS;
- goto fail;
- }
- sav->lft_s = (__typeof__(sav->lft_s))key_newbuf(lifetime_soft,
- sizeof(*lifetime_soft));
- if (sav->lft_s == NULL) {
- ipseclog((LOG_DEBUG, "key_setsaval: No more memory.\n"));
- error = ENOBUFS;
- goto fail;
- }
-
- return 0;
-
-fail:
- /* initialization */
- for (int i = 0; i < MAX_REPLAY_WINDOWS; i++) {
- if (sav->replay[i] != NULL) {
- keydb_delsecreplay(sav->replay[i]);
- sav->replay[i] = NULL;
- }
- }
- if (sav->key_auth != NULL) {
- bzero(_KEYBUF(sav->key_auth), _KEYLEN(sav->key_auth));
- KFREE(sav->key_auth);
- sav->key_auth = NULL;
- }
- if (sav->key_enc != NULL) {
- bzero(_KEYBUF(sav->key_enc), _KEYLEN(sav->key_enc));
- KFREE(sav->key_enc);
- sav->key_enc = NULL;
- }
- if (sav->sched) {
- bzero(sav->sched, sav->schedlen);
- KFREE(sav->sched);
- sav->sched = NULL;
- }
- if (sav->iv != NULL) {
- KFREE(sav->iv);
- sav->iv = NULL;
- }
- if (sav->lft_c != NULL) {
- KFREE(sav->lft_c);
- sav->lft_c = NULL;
- }
- if (sav->lft_h != NULL) {
- KFREE(sav->lft_h);
- sav->lft_h = NULL;
- }
- if (sav->lft_s != NULL) {
- KFREE(sav->lft_s);
- sav->lft_s = NULL;
- }
-
+ key_reset_sav(sav);
return error;
}
SADB_EXT_IDENTITY_DST, SADB_EXT_SENSITIVITY,
};
- m = key_setsadbmsg(type, 0, satype, seq, pid, sav->refcnt);
+ m = key_setsadbmsg(type, 0, satype, seq, pid, (u_int16_t)sav->refcnt);
if (m == NULL) {
goto fail;
}
result->m_pkthdr.len += m->m_len;
}
+ VERIFY(PFKEY_UNIT64(result->m_pkthdr.len) <= UINT16_MAX);
mtod(result, struct sadb_msg *)->sadb_msg_len =
- PFKEY_UNIT64(result->m_pkthdr.len);
+ (u_int16_t)PFKEY_UNIT64(result->m_pkthdr.len);
return result;
{
struct mbuf *m;
struct sadb_sa *p;
- int len;
+ u_int16_t len;
len = PFKEY_ALIGN8(sizeof(struct sadb_sa));
m = key_alloc_mbuf(len);
key_setsadbaddr(
u_int16_t exttype,
struct sockaddr *saddr,
- u_int8_t prefixlen,
- u_int16_t ul_proto)
+ size_t prefixlen,
+ u_int8_t ul_proto)
{
struct mbuf *m;
struct sadb_address *p;
- size_t len;
+ u_int16_t len;
len = PFKEY_ALIGN8(sizeof(struct sadb_address)) +
PFKEY_ALIGN8(saddr->sa_len);
; /*XXX*/
}
}
- p->sadb_address_prefixlen = prefixlen;
+ if (prefixlen >= UINT8_MAX) {
+ ipseclog((LOG_ERR, "key_setsadbaddr: bad prefix length %zu", prefixlen));
+ m_freem(m);
+ return NULL;
+ }
+ p->sadb_address_prefixlen = (u_int8_t)prefixlen;
p->sadb_address_reserved = 0;
bcopy(saddr,
key_setsadbipsecif(ifnet_t internal_if,
ifnet_t outgoing_if,
ifnet_t ipsec_if,
- int init_disabled)
+ u_int8_t init_disabled)
{
struct mbuf *m;
struct sadb_x_ipsecif *p;
- size_t len;
+ u_int16_t len;
len = PFKEY_ALIGN8(sizeof(struct sadb_x_ipsecif));
m = key_alloc_mbuf(len);
{
struct mbuf *m;
struct sadb_session_id *p;
- size_t len;
+ u_int16_t len;
len = PFKEY_ALIGN8(sizeof(*p));
m = key_alloc_mbuf(len);
struct sastat *stats,
u_int32_t max_stats)
{
- struct mbuf *m;
+ struct mbuf *m;
struct sadb_sastat *p;
- int list_len, len;
+ size_t list_len, len;
if (!stats) {
return NULL;
list_len = sizeof(*stats) * max_stats;
len = PFKEY_ALIGN8(sizeof(*p)) + PFKEY_ALIGN8(list_len);
- m = key_alloc_mbuf(len);
- if (!m || m->m_next) { /*XXX*/
- if (m) {
- m_freem(m);
- }
+ if (PFKEY_UNIT64(len) >= UINT16_MAX) {
+ ipseclog((LOG_ERR, "key_setsadbsastat: length is too big: %zu\n", len));
return NULL;
}
- p = mtod(m, __typeof__(p));
-
- bzero(p, len);
- p->sadb_sastat_len = PFKEY_UNIT64(len);
- p->sadb_sastat_exttype = SADB_EXT_SASTAT;
- p->sadb_sastat_dir = dir;
- p->sadb_sastat_list_len = max_stats;
- if (list_len) {
- bcopy(stats,
- mtod(m, caddr_t) + PFKEY_ALIGN8(sizeof(*p)),
- list_len);
- }
-
- return m;
-}
-
-#if 0
-/*
- * set data into sadb_ident.
- */
-static struct mbuf *
-key_setsadbident(
- u_int16_t exttype,
- u_int16_t idtype,
- caddr_t string,
- int stringlen,
- u_int64_t id)
-{
- struct mbuf *m;
- struct sadb_ident *p;
- size_t len;
-
- len = PFKEY_ALIGN8(sizeof(struct sadb_ident)) + PFKEY_ALIGN8(stringlen);
- m = key_alloc_mbuf(len);
+ m = key_alloc_mbuf((int)len);
if (!m || m->m_next) { /*XXX*/
if (m) {
m_freem(m);
return NULL;
}
- p = mtod(m, struct sadb_ident *);
+ p = mtod(m, __typeof__(p));
bzero(p, len);
- p->sadb_ident_len = PFKEY_UNIT64(len);
- p->sadb_ident_exttype = exttype;
- p->sadb_ident_type = idtype;
- p->sadb_ident_reserved = 0;
- p->sadb_ident_id = id;
-
- bcopy(string,
- mtod(m, caddr_t) + PFKEY_ALIGN8(sizeof(struct sadb_ident)),
- stringlen);
+ p->sadb_sastat_len = (u_int16_t)PFKEY_UNIT64(len);
+ p->sadb_sastat_exttype = SADB_EXT_SASTAT;
+ p->sadb_sastat_dir = dir;
+ p->sadb_sastat_list_len = max_stats;
+ if (list_len) {
+ bcopy(stats,
+ mtod(m, caddr_t) + PFKEY_ALIGN8(sizeof(*p)),
+ list_len);
+ }
return m;
}
-#endif
/*
* set data into sadb_x_sa2.
{
struct mbuf *m;
struct sadb_x_sa2 *p;
- size_t len;
+ u_int16_t len;
len = PFKEY_ALIGN8(sizeof(struct sadb_x_sa2));
m = key_alloc_mbuf(len);
{
struct mbuf *m;
struct sadb_x_policy *p;
- size_t len;
+ u_int16_t len;
len = PFKEY_ALIGN8(sizeof(struct sadb_x_policy));
m = key_alloc_mbuf(len);
lck_rw_done(in_ifaddr_rwlock);
break;
#endif
-#if INET6
case AF_INET6:
return key_ismyaddr6((struct sockaddr_in6 *)(void *)sa);
-#endif
}
return 0;
}
-#if INET6
/*
* compare my own address for IPv6.
* 1: ours
return 0;
}
-#endif /*INET6*/
/*
* compare two secasindex structure.
}
if (bits > 0) {
- mask = ~((1 << (8 - bits)) - 1);
+ mask = (u_int8_t)(~((1 << (8 - bits)) - 1));
if ((*p1 & mask) != (*p2 & mask)) {
return 0;
}
struct secpolicy **spbuf = NULL, **spptr = NULL;
struct secasvar **savexbuf = NULL, **savexptr = NULL;
struct secasvar **savkabuf = NULL, **savkaptr = NULL;
- u_int64_t total_req_size = 0;
+ size_t total_req_size = 0;
u_int32_t spbufcount = 0, savbufcount = 0, spcount = 0, savexcount = 0, savkacount = 0, cnt;
int stop_handler = 1; /* stop the timehandler */
* OUT:
* 0: invalid satype.
*/
-static u_int16_t
+static u_int8_t
key_satype2proto(
u_int8_t satype)
{
ipsecifopts = (struct sadb_x_ipsecif *)(void *)mhp->ext[message_type];
if (ipsecifopts != NULL) {
if (ipsecifopts->sadb_x_ipsecif_ipsec_if[0]) {
+ ipsecifopts->sadb_x_ipsecif_ipsec_if[IFXNAMSIZ - 1] = '\0';
ifnet_find_by_name(ipsecifopts->sadb_x_ipsecif_ipsec_if, &ipsec_if);
}
}
ipsecifopts = (struct sadb_x_ipsecif *)(void *)mhp->ext[message_type];
if (ipsecifopts != NULL) {
if (ipsecifopts->sadb_x_ipsecif_outgoing_if[0]) {
+ ipsecifopts->sadb_x_ipsecif_outgoing_if[IFXNAMSIZ - 1] = '\0';
ifnet_find_by_name(ipsecifopts->sadb_x_ipsecif_outgoing_if, &outgoing_if);
}
}
- return outgoing_if ? outgoing_if->if_index : 0;
+ u_int outgoing_if_index = 0;
+ if (outgoing_if != NULL) {
+ outgoing_if_index = outgoing_if->if_index;
+ ifnet_release(outgoing_if);
+ }
+
+ return outgoing_if_index;
}
/* %%% PF_KEY */
src0 = (struct sadb_address *)(mhp->ext[SADB_EXT_ADDRESS_SRC]);
dst0 = (struct sadb_address *)(mhp->ext[SADB_EXT_ADDRESS_DST]);
- ipsec_if = key_get_ipsec_if_from_message(mhp, SADB_X_EXT_IPSECIF);
-
/* map satype to proto */
if ((proto = key_satype2proto(mhp->msg->sadb_msg_satype)) == 0) {
ipseclog((LOG_DEBUG, "key_getspi: invalid satype is passed.\n"));
; /*???*/
}
+ ipsec_if = key_get_ipsec_if_from_message(mhp, SADB_X_EXT_IPSECIF);
+
/* XXX boundary check against sa_len */
KEY_SETSECASIDX(proto, mode, reqid, src0 + 1, dst0 + 1, ipsec_if ? ipsec_if->if_index : 0, &saidx);
(void *)mhp->ext[SADB_EXT_SPIRANGE], &saidx);
if (spi == 0) {
lck_mtx_unlock(sadb_mutex);
+ if (ipsec_if != NULL) {
+ ifnet_release(ipsec_if);
+ }
return key_senderror(so, m, EINVAL);
}
/* create a new SA index: key_addspi is always used for inbound spi */
if ((newsah = key_newsah(&saidx, ipsec_if, key_get_outgoing_ifindex_from_message(mhp, SADB_X_EXT_IPSECIF), IPSEC_DIR_INBOUND, SECURITY_ASSOCIATION_PFKEY)) == NULL) {
lck_mtx_unlock(sadb_mutex);
+ if (ipsec_if != NULL) {
+ ifnet_release(ipsec_if);
+ }
ipseclog((LOG_DEBUG, "key_getspi: No more memory.\n"));
return key_senderror(so, m, ENOBUFS);
}
}
+ if (ipsec_if != NULL) {
+ ifnet_release(ipsec_if);
+ ipsec_if = NULL;
+ }
+
+ // Increment use count, since key_newsav() could release sadb_mutex lock
+ newsah->use_count++;
+
if ((newsah->flags & SECURITY_ASSOCIATION_CUSTOM_IPSEC) == SECURITY_ASSOCIATION_CUSTOM_IPSEC) {
+ newsah->use_count--;
lck_mtx_unlock(sadb_mutex);
ipseclog((LOG_ERR, "key_getspi: custom ipsec exists\n"));
return key_senderror(so, m, EEXIST);
newsav = key_newsav(m, mhp, newsah, &error, so);
if (newsav == NULL) {
/* XXX don't free new SA index allocated in above. */
+ newsah->use_count--;
lck_mtx_unlock(sadb_mutex);
return key_senderror(so, m, error);
}
+ if (newsah->state == SADB_SASTATE_DEAD) {
+ newsah->use_count--;
+ key_sa_chgstate(newsav, SADB_SASTATE_DEAD);
+ key_freesav(newsav, KEY_SADB_LOCKED);
+ lck_mtx_unlock(sadb_mutex);
+ ipseclog((LOG_ERR, "key_getspi: security association head is dead\n"));
+ return key_senderror(so, m, EINVAL);
+ }
+
/* set spi */
key_setspi(newsav, htonl(spi));
}
}
#endif
-
+ newsah->use_count--;
lck_mtx_unlock(sadb_mutex);
{
newmsg = mtod(n, struct sadb_msg *);
newmsg->sadb_msg_seq = newsav->seq;
newmsg->sadb_msg_errno = 0;
- newmsg->sadb_msg_len = PFKEY_UNIT64(n->m_pkthdr.len);
+ VERIFY(PFKEY_UNIT64(n->m_pkthdr.len) <= UINT16_MAX);
+ newmsg->sadb_msg_len = (u_int16_t)PFKEY_UNIT64(n->m_pkthdr.len);
m_freem(m);
return key_sendup_mbuf(so, n, KEY_SENDUP_ONE);
}
}
-u_int32_t
-key_getspi2(struct sockaddr *src,
- struct sockaddr *dst,
- u_int8_t proto,
- u_int8_t mode,
- u_int32_t reqid,
- struct sadb_spirange *spirange)
-{
- u_int32_t spi;
- struct secasindex saidx;
-
- LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED);
-
- /* XXX boundary check against sa_len */
- KEY_SETSECASIDX(proto, mode, reqid, src, dst, 0, &saidx);
-
- /* make sure if port number is zero. */
- switch (((struct sockaddr *)&saidx.src)->sa_family) {
- case AF_INET:
- if (((struct sockaddr *)&saidx.src)->sa_len != sizeof(struct sockaddr_in)) {
- return 0;
- }
- ((struct sockaddr_in *)&saidx.src)->sin_port = 0;
- break;
- case AF_INET6:
- if (((struct sockaddr *)&saidx.src)->sa_len != sizeof(struct sockaddr_in6)) {
- return 0;
- }
- ((struct sockaddr_in6 *)&saidx.src)->sin6_port = 0;
- break;
- default:
- ; /*???*/
- }
- switch (((struct sockaddr *)&saidx.dst)->sa_family) {
- case AF_INET:
- if (((struct sockaddr *)&saidx.dst)->sa_len != sizeof(struct sockaddr_in)) {
- return 0;
- }
- ((struct sockaddr_in *)&saidx.dst)->sin_port = 0;
- break;
- case AF_INET6:
- if (((struct sockaddr *)&saidx.dst)->sa_len != sizeof(struct sockaddr_in6)) {
- return 0;
- }
- ((struct sockaddr_in6 *)&saidx.dst)->sin6_port = 0;
- break;
- default:
- ; /*???*/
- }
-
- lck_mtx_lock(sadb_mutex);
-
- /* SPI allocation */
- spi = key_do_getnewspi(spirange, &saidx);
-
- lck_mtx_unlock(sadb_mutex);
-
- return spi;
-}
-
/*
* allocating new SPI
- * called by key_getspi() and key_getspi2().
+ * called by key_getspi().
* OUT:
* 0: failure.
* others: success.
struct mbuf *m,
const struct sadb_msghdr *mhp)
{
- struct sadb_sa *sa0;
- struct sadb_address *src0, *dst0;
+ struct sadb_sa *sa0 = NULL;
+ struct sadb_address *src0 = NULL, *dst0 = NULL;
ifnet_t ipsec_if = NULL;
struct secasindex saidx;
- struct secashead *sah;
- struct secasvar *sav;
- u_int16_t proto;
+ struct secashead *sah = NULL;
+ struct secasvar *sav = NULL;
+ u_int8_t proto;
u_int8_t mode;
u_int32_t reqid;
u_int16_t flags2;
/* map satype to proto */
if ((proto = key_satype2proto(mhp->msg->sadb_msg_satype)) == 0) {
ipseclog((LOG_DEBUG, "key_update: invalid satype is passed.\n"));
+ bzero_keys(mhp);
return key_senderror(so, m, EINVAL);
}
(mhp->ext[SADB_EXT_LIFETIME_HARD] == NULL &&
mhp->ext[SADB_EXT_LIFETIME_SOFT] != NULL)) {
ipseclog((LOG_DEBUG, "key_update: invalid message is passed.\n"));
+ bzero_keys(mhp);
return key_senderror(so, m, EINVAL);
}
if (mhp->extlen[SADB_EXT_SA] < sizeof(struct sadb_sa) ||
mhp->extlen[SADB_EXT_ADDRESS_SRC] < sizeof(struct sadb_address) ||
mhp->extlen[SADB_EXT_ADDRESS_DST] < sizeof(struct sadb_address)) {
ipseclog((LOG_DEBUG, "key_update: invalid message is passed.\n"));
+ bzero_keys(mhp);
return key_senderror(so, m, EINVAL);
}
if (mhp->ext[SADB_X_EXT_SA2] != NULL) {
dst0 = (struct sadb_address *)(mhp->ext[SADB_EXT_ADDRESS_DST]);
ipsec_if = key_get_ipsec_if_from_message(mhp, SADB_X_EXT_IPSECIF);
+ u_int ipsec_if_index = 0;
+ if (ipsec_if != NULL) {
+ ipsec_if_index = ipsec_if->if_index;
+ ifnet_release(ipsec_if);
+ ipsec_if = NULL;
+ }
+
/* XXX boundary check against sa_len */
- KEY_SETSECASIDX(proto, mode, reqid, src0 + 1, dst0 + 1, ipsec_if ? ipsec_if->if_index : 0, &saidx);
+ KEY_SETSECASIDX(proto, mode, reqid, src0 + 1, dst0 + 1, ipsec_if_index, &saidx);
lck_mtx_lock(sadb_mutex);
if ((sah = key_getsah(&saidx, SECURITY_ASSOCIATION_PFKEY)) == NULL) {
lck_mtx_unlock(sadb_mutex);
ipseclog((LOG_DEBUG, "key_update: no SA index found.\n"));
+ bzero_keys(mhp);
return key_senderror(so, m, ENOENT);
}
- /* set spidx if there */
- /* XXX rewrite */
- error = key_setident(sah, m, mhp);
- if (error) {
- lck_mtx_unlock(sadb_mutex);
- return key_senderror(so, m, error);
- }
+ // Increment use count, since key_setsaval() could release sadb_mutex lock
+ sah->use_count++;
if ((sav = key_getsavbyspi(sah, sa0->sadb_sa_spi)) == NULL) {
- lck_mtx_unlock(sadb_mutex);
ipseclog((LOG_DEBUG,
"key_update: no such a SA found (spi:%u)\n",
(u_int32_t)ntohl(sa0->sadb_sa_spi)));
- return key_senderror(so, m, EINVAL);
+ error = EINVAL;
+ goto fail;
}
+ // Increment reference count, since key_setsaval() could release sadb_mutex lock
+ sav->refcnt++;
+
/* validity check */
if (sav->sah->saidx.proto != proto) {
ipseclog((LOG_DEBUG,
"key_update: protocol mismatched (DB=%u param=%u)\n",
sav->sah->saidx.proto, proto));
- lck_mtx_unlock(sadb_mutex);
- return key_senderror(so, m, EINVAL);
+ error = EINVAL;
+ goto fail;
}
if (sav->pid != mhp->msg->sadb_msg_pid) {
ipseclog((LOG_DEBUG,
"key_update: pid mismatched (DB:%u param:%u)\n",
sav->pid, mhp->msg->sadb_msg_pid));
- lck_mtx_unlock(sadb_mutex);
- return key_senderror(so, m, EINVAL);
+ error = EINVAL;
+ goto fail;
}
/* copy sav values */
error = key_setsaval(sav, m, mhp);
if (error) {
- lck_mtx_unlock(sadb_mutex);
- return key_senderror(so, m, error);
+ goto fail;
+ }
+
+ if (sah->state == SADB_SASTATE_DEAD) {
+ ipseclog((LOG_ERR,
+ "key_update: security association head is dead\n"));
+ error = EINVAL;
+ goto fail;
}
sav->flags2 = flags2;
/* check SA values to be mature. */
if ((error = key_mature(sav)) != 0) {
- lck_mtx_unlock(sadb_mutex);
- return key_senderror(so, m, error);
+ goto fail;
}
+ key_freesav(sav, KEY_SADB_LOCKED);
+ sah->use_count--;
lck_mtx_unlock(sadb_mutex);
{
return key_senderror(so, m, ENOBUFS);
}
+ bzero_keys(mhp);
m_freem(m);
return key_sendup_mbuf(so, n, KEY_SENDUP_ALL);
}
+fail:
+ if (sav != NULL) {
+ key_freesav(sav, KEY_SADB_LOCKED);
+ }
+ if (sah != NULL) {
+ sah->use_count--;
+ }
+
+ lck_mtx_unlock(sadb_mutex);
+ bzero_keys(mhp);
+ return key_senderror(so, m, error);
}
static int
struct secashead *sah = NULL;
struct secashead *newsah = NULL;
struct secasvar *sav = NULL;
- u_int16_t proto;
+ u_int8_t proto;
LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED);
ipsec_if0 = key_get_ipsec_if_from_message(mhp, SADB_X_EXT_IPSECIF);
ipsec_if1 = key_get_ipsec_if_from_message(mhp, SADB_X_EXT_MIGRATE_IPSECIF);
+ u_int ipsec_if0_index = 0;
+ if (ipsec_if0 != NULL) {
+ ipsec_if0_index = ipsec_if0->if_index;
+ ifnet_release(ipsec_if0);
+ ipsec_if0 = NULL;
+ }
+
/* Find existing SAH and SAV */
- KEY_SETSECASIDX(proto, IPSEC_MODE_ANY, 0, src0 + 1, dst0 + 1, ipsec_if0 ? ipsec_if0->if_index : 0, &saidx0);
+ KEY_SETSECASIDX(proto, IPSEC_MODE_ANY, 0, src0 + 1, dst0 + 1, ipsec_if0_index, &saidx0);
LIST_FOREACH(sah, &sahtree, chain) {
if (sah->state != SADB_SASTATE_MATURE) {
}
if (sah == NULL) {
lck_mtx_unlock(sadb_mutex);
+ if (ipsec_if1 != NULL) {
+ ifnet_release(ipsec_if1);
+ }
ipseclog((LOG_DEBUG, "key_migrate: no mature SAH found.\n"));
return key_senderror(so, m, ENOENT);
}
if (sav == NULL) {
lck_mtx_unlock(sadb_mutex);
+ if (ipsec_if1 != NULL) {
+ ifnet_release(ipsec_if1);
+ }
ipseclog((LOG_DEBUG, "key_migrate: no SA found.\n"));
return key_senderror(so, m, ENOENT);
}
if ((newsah = key_getsah(&saidx1, SECURITY_ASSOCIATION_ANY)) == NULL) {
if ((newsah = key_newsah(&saidx1, ipsec_if1, key_get_outgoing_ifindex_from_message(mhp, SADB_X_EXT_MIGRATE_IPSECIF), sah->dir, SECURITY_ASSOCIATION_PFKEY)) == NULL) {
lck_mtx_unlock(sadb_mutex);
+ if (ipsec_if1 != NULL) {
+ ifnet_release(ipsec_if1);
+ }
ipseclog((LOG_DEBUG, "key_migrate: No more memory.\n"));
return key_senderror(so, m, ENOBUFS);
}
}
+ if (ipsec_if1 != NULL) {
+ ifnet_release(ipsec_if1);
+ ipsec_if1 = NULL;
+ }
+
if ((newsah->flags & SECURITY_ASSOCIATION_CUSTOM_IPSEC) == SECURITY_ASSOCIATION_CUSTOM_IPSEC) {
lck_mtx_unlock(sadb_mutex);
ipseclog((LOG_ERR, "key_migrate: custom ipsec exists\n"));
}
newmsg = mtod(n, struct sadb_msg *);
newmsg->sadb_msg_errno = 0;
- newmsg->sadb_msg_len = PFKEY_UNIT64(n->m_pkthdr.len);
+ VERIFY(PFKEY_UNIT64(n->m_pkthdr.len) <= UINT16_MAX);
+ newmsg->sadb_msg_len = (u_int16_t)PFKEY_UNIT64(n->m_pkthdr.len);
m_freem(m);
return key_sendup_mbuf(so, n, KEY_SENDUP_ALL);
struct mbuf *m,
const struct sadb_msghdr *mhp)
{
- struct sadb_sa *sa0;
- struct sadb_address *src0, *dst0;
+ struct sadb_sa *sa0 = NULL;
+ struct sadb_address *src0 = NULL, *dst0 = NULL;
ifnet_t ipsec_if = NULL;
struct secasindex saidx;
- struct secashead *newsah;
- struct secasvar *newsav;
- u_int16_t proto;
+ struct secashead *newsah = NULL;
+ struct secasvar *newsav = NULL;
+ u_int8_t proto;
u_int8_t mode;
u_int32_t reqid;
int error;
if ((newsah = key_getsah(&saidx, SECURITY_ASSOCIATION_ANY)) == NULL) {
/* create a new SA header: key_addspi is always used for outbound spi */
if ((newsah = key_newsah(&saidx, ipsec_if, key_get_outgoing_ifindex_from_message(mhp, SADB_X_EXT_IPSECIF), IPSEC_DIR_OUTBOUND, SECURITY_ASSOCIATION_PFKEY)) == NULL) {
- lck_mtx_unlock(sadb_mutex);
ipseclog((LOG_DEBUG, "key_add: No more memory.\n"));
- bzero_keys(mhp);
- return key_senderror(so, m, ENOBUFS);
+ error = ENOBUFS;
+ goto fail;
}
}
- if ((newsah->flags & SECURITY_ASSOCIATION_CUSTOM_IPSEC) == SECURITY_ASSOCIATION_CUSTOM_IPSEC) {
- lck_mtx_unlock(sadb_mutex);
- ipseclog((LOG_ERR, "key_add: custom ipsec exists\n"));
- bzero_keys(mhp);
- return key_senderror(so, m, EEXIST);
+ if (ipsec_if != NULL) {
+ ifnet_release(ipsec_if);
+ ipsec_if = NULL;
}
- /* set spidx if there */
- /* XXX rewrite */
- error = key_setident(newsah, m, mhp);
- if (error) {
- lck_mtx_unlock(sadb_mutex);
- bzero_keys(mhp);
- return key_senderror(so, m, error);
+ // Increment use count, since key_newsav() could release sadb_mutex lock
+ newsah->use_count++;
+
+ if ((newsah->flags & SECURITY_ASSOCIATION_CUSTOM_IPSEC) == SECURITY_ASSOCIATION_CUSTOM_IPSEC) {
+ ipseclog((LOG_ERR, "key_add: custom ipsec exists\n"));
+ error = EEXIST;
+ goto fail;
}
/* create new SA entry. */
/* We can create new SA only if SPI is different. */
if (key_getsavbyspi(newsah, sa0->sadb_sa_spi)) {
- lck_mtx_unlock(sadb_mutex);
ipseclog((LOG_DEBUG, "key_add: SA already exists.\n"));
- bzero_keys(mhp);
- return key_senderror(so, m, EEXIST);
+ error = EEXIST;
+ goto fail;
}
newsav = key_newsav(m, mhp, newsah, &error, so);
if (newsav == NULL) {
- lck_mtx_unlock(sadb_mutex);
- bzero_keys(mhp);
- return key_senderror(so, m, error);
+ goto fail;
+ }
+
+ if (newsah->state == SADB_SASTATE_DEAD) {
+ ipseclog((LOG_ERR, "key_add: security association head is dead\n"));
+ error = EINVAL;
+ goto fail;
}
/*
/* check SA values to be mature. */
if ((error = key_mature(newsav)) != 0) {
- key_freesav(newsav, KEY_SADB_LOCKED);
- lck_mtx_unlock(sadb_mutex);
- bzero_keys(mhp);
- return key_senderror(so, m, error);
+ goto fail;
}
+ newsah->use_count--;
lck_mtx_unlock(sadb_mutex);
/*
m_freem(m);
return key_sendup_mbuf(so, n, KEY_SENDUP_ALL);
}
-}
-
-/* m is retained */
-static int
-key_setident(
- struct secashead *sah,
- struct mbuf *m,
- const struct sadb_msghdr *mhp)
-{
- const struct sadb_ident *idsrc, *iddst;
- int idsrclen, iddstlen;
-
- LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED);
-
- /* sanity check */
- if (sah == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) {
- panic("key_setident: NULL pointer is passed.\n");
- }
-
- /* don't make buffer if not there */
- if (mhp->ext[SADB_EXT_IDENTITY_SRC] == NULL &&
- mhp->ext[SADB_EXT_IDENTITY_DST] == NULL) {
- sah->idents = NULL;
- sah->identd = NULL;
- return 0;
- }
-
- if (mhp->ext[SADB_EXT_IDENTITY_SRC] == NULL ||
- mhp->ext[SADB_EXT_IDENTITY_DST] == NULL) {
- ipseclog((LOG_DEBUG, "key_setident: invalid identity.\n"));
- return EINVAL;
- }
-
- idsrc = (const struct sadb_ident *)
- (void *)mhp->ext[SADB_EXT_IDENTITY_SRC];
- iddst = (const struct sadb_ident *)
- (void *)mhp->ext[SADB_EXT_IDENTITY_DST];
- idsrclen = mhp->extlen[SADB_EXT_IDENTITY_SRC];
- iddstlen = mhp->extlen[SADB_EXT_IDENTITY_DST];
-
- /* validity check */
- if (idsrc->sadb_ident_type != iddst->sadb_ident_type) {
- ipseclog((LOG_DEBUG, "key_setident: ident type mismatch.\n"));
- return EINVAL;
- }
-
- switch (idsrc->sadb_ident_type) {
- case SADB_IDENTTYPE_PREFIX:
- case SADB_IDENTTYPE_FQDN:
- case SADB_IDENTTYPE_USERFQDN:
- default:
- /* XXX do nothing */
- sah->idents = NULL;
- sah->identd = NULL;
- return 0;
+fail:
+ if (newsav != NULL) {
+ key_sa_chgstate(newsav, SADB_SASTATE_DEAD);
+ key_freesav(newsav, KEY_SADB_LOCKED);
}
-
- /* make structure */
- KMALLOC_NOWAIT(sah->idents, struct sadb_ident *, idsrclen);
- if (sah->idents == NULL) {
- lck_mtx_unlock(sadb_mutex);
- KMALLOC_WAIT(sah->idents, struct sadb_ident *, idsrclen);
- lck_mtx_lock(sadb_mutex);
- if (sah->idents == NULL) {
- ipseclog((LOG_DEBUG, "key_setident: No more memory.\n"));
- return ENOBUFS;
- }
+ if (newsah != NULL) {
+ newsah->use_count--;
}
- KMALLOC_NOWAIT(sah->identd, struct sadb_ident *, iddstlen);
- if (sah->identd == NULL) {
- lck_mtx_unlock(sadb_mutex);
- KMALLOC_WAIT(sah->identd, struct sadb_ident *, iddstlen);
- lck_mtx_lock(sadb_mutex);
- if (sah->identd == NULL) {
- KFREE(sah->idents);
- sah->idents = NULL;
- ipseclog((LOG_DEBUG, "key_setident: No more memory.\n"));
- return ENOBUFS;
- }
+ lck_mtx_unlock(sadb_mutex);
+ if (ipsec_if != NULL) {
+ ifnet_release(ipsec_if);
}
- bcopy(idsrc, sah->idents, idsrclen);
- bcopy(iddst, sah->identd, iddstlen);
-
- return 0;
+ bzero_keys(mhp);
+ return key_senderror(so, m, error);
}
/*
}
}
mtod(n, struct sadb_msg *)->sadb_msg_errno = 0;
+ VERIFY(PFKEY_UNIT64(n->m_pkthdr.len) <= UINT16_MAX);
mtod(n, struct sadb_msg *)->sadb_msg_len =
- PFKEY_UNIT64(n->m_pkthdr.len);
+ (u_int16_t)PFKEY_UNIT64(n->m_pkthdr.len);
return n;
}
dst0 = (struct sadb_address *)(mhp->ext[SADB_EXT_ADDRESS_DST]);
ipsec_if = key_get_ipsec_if_from_message(mhp, SADB_X_EXT_IPSECIF);
+ u_int ipsec_if_index = 0;
+ if (ipsec_if != NULL) {
+ ipsec_if_index = ipsec_if->if_index;
+ ifnet_release(ipsec_if);
+ ipsec_if = NULL;
+ }
+
/* XXX boundary check against sa_len */
- KEY_SETSECASIDX(proto, IPSEC_MODE_ANY, 0, src0 + 1, dst0 + 1, ipsec_if ? ipsec_if->if_index : 0, &saidx);
+ KEY_SETSECASIDX(proto, IPSEC_MODE_ANY, 0, src0 + 1, dst0 + 1, ipsec_if_index, &saidx);
+
/* get a SA header */
LIST_FOREACH(sah, &sahtree, chain) {
}
newmsg = mtod(n, struct sadb_msg *);
newmsg->sadb_msg_errno = 0;
- newmsg->sadb_msg_len = PFKEY_UNIT64(n->m_pkthdr.len);
+ VERIFY(PFKEY_UNIT64(n->m_pkthdr.len) <= UINT16_MAX);
+ newmsg->sadb_msg_len = (u_int16_t)PFKEY_UNIT64(n->m_pkthdr.len);
m_freem(m);
return key_sendup_mbuf(so, n, KEY_SENDUP_ALL);
dst0 = (struct sadb_address *)(mhp->ext[SADB_EXT_ADDRESS_DST]);
ipsec_if = key_get_ipsec_if_from_message(mhp, SADB_X_EXT_IPSECIF);
+ u_int ipsec_if_index = 0;
+ if (ipsec_if != NULL) {
+ ipsec_if_index = ipsec_if->if_index;
+ ifnet_release(ipsec_if);
+ ipsec_if = NULL;
+ }
+
/* XXX boundary check against sa_len */
- KEY_SETSECASIDX(proto, IPSEC_MODE_ANY, 0, src0 + 1, dst0 + 1, ipsec_if ? ipsec_if->if_index : 0, &saidx);
+ KEY_SETSECASIDX(proto, IPSEC_MODE_ANY, 0, src0 + 1, dst0 + 1, ipsec_if_index, &saidx);
LIST_FOREACH(sah, &sahtree, chain) {
if (sah->state == SADB_SASTATE_DEAD) {
}
newmsg = mtod(n, struct sadb_msg *);
newmsg->sadb_msg_errno = 0;
- newmsg->sadb_msg_len = PFKEY_UNIT64(n->m_pkthdr.len);
+ VERIFY(PFKEY_UNIT64(n->m_pkthdr.len) <= UINT16_MAX);
+ newmsg->sadb_msg_len = (u_int16_t)PFKEY_UNIT64(n->m_pkthdr.len);
m_freem(m);
return key_sendup_mbuf(so, n, KEY_SENDUP_ALL);
dst0 = (struct sadb_address *)mhp->ext[SADB_EXT_ADDRESS_DST];
ipsec_if = key_get_ipsec_if_from_message(mhp, SADB_X_EXT_IPSECIF);
+ u_int ipsec_if_index = 0;
+ if (ipsec_if != NULL) {
+ ipsec_if_index = ipsec_if->if_index;
+ ifnet_release(ipsec_if);
+ ipsec_if = NULL;
+ }
+
/* XXX boundary check against sa_len */
- KEY_SETSECASIDX(proto, IPSEC_MODE_ANY, 0, src0 + 1, dst0 + 1, ipsec_if ? ipsec_if->if_index : 0, &saidx);
+ KEY_SETSECASIDX(proto, IPSEC_MODE_ANY, 0, src0 + 1, dst0 + 1, ipsec_if_index, &saidx);
lck_mtx_lock(sadb_mutex);
sav = key_getsavbyspi(sah, spi);
if (sav) {
stat->spi = sav->spi;
- stat->created = sav->created;
+ stat->created = (u_int32_t)sav->created;
if (sav->lft_c) {
bcopy(sav->lft_c, &stat->lft_c, sizeof(stat->lft_c));
} else {
key_getsastatbyspi(struct sastat *stat_arg,
u_int32_t max_stat_arg,
struct sastat *stat_res,
- u_int32_t stat_res_size,
+ u_int64_t stat_res_size,
u_int32_t *max_stat_res)
{
- int cur, found = 0;
+ u_int32_t cur, found = 0;
if (stat_arg == NULL ||
stat_res == NULL ||
return -1;
}
- u_int32_t max_stats = stat_res_size / (sizeof(struct sastat));
+ u_int64_t max_stats = stat_res_size / (sizeof(struct sastat));
max_stats = ((max_stat_arg <= max_stats) ? max_stat_arg : max_stats);
for (cur = 0; cur < max_stats; cur++) {
struct sadb_comb *comb;
const struct esp_algorithm *algo;
struct mbuf *result = NULL, *m, *n;
- int encmin;
- int i, off, o;
+ u_int16_t encmin;
+ int off, o;
int totlen;
+ u_int8_t i;
const int l = PFKEY_ALIGN8(sizeof(struct sadb_comb));
m = NULL;
continue;
}
if (algo->keymin < ipsec_esp_keymin) {
- encmin = ipsec_esp_keymin;
+ encmin = (u_int16_t)ipsec_esp_keymin;
} else {
encmin = algo->keymin;
}
struct sadb_comb *comb;
const struct ah_algorithm *algo;
struct mbuf *m;
- int keymin;
- int i;
+ u_int16_t keymin;
+ u_int8_t i;
const int l = PFKEY_ALIGN8(sizeof(struct sadb_comb));
m = NULL;
continue;
}
if (algo->keymin < ipsec_ah_keymin) {
- keymin = ipsec_ah_keymin;
+ keymin = (u_int16_t)ipsec_ah_keymin;
} else {
keymin = algo->keymin;
}
prop = mtod(m, struct sadb_prop *);
bzero(prop, sizeof(*prop));
- prop->sadb_prop_len = PFKEY_UNIT64(totlen);
+ VERIFY(totlen <= UINT16_MAX);
+ prop->sadb_prop_len = (u_int16_t)PFKEY_UNIT64(totlen);
prop->sadb_prop_exttype = SADB_EXT_PROPOSAL;
prop->sadb_prop_replay = 32; /* XXX */
/* set sadb_x_policy */
if (sp) {
- m = key_setsadbxpolicy(sp->policy, sp->spidx.dir, sp->id);
+ m = key_setsadbxpolicy((u_int16_t)sp->policy, sp->spidx.dir, sp->id);
if (!m) {
error = ENOBUFS;
goto fail;
m_cat(result, m);
}
- /* XXX identity (optional) */
-#if 0
- if (idexttype && fqdn) {
- /* create identity extension (FQDN) */
- struct sadb_ident *id;
- int fqdnlen;
-
- fqdnlen = strlen(fqdn) + 1; /* +1 for terminating-NUL */
- id = (struct sadb_ident *)p;
- bzero(id, sizeof(*id) + PFKEY_ALIGN8(fqdnlen));
- id->sadb_ident_len = PFKEY_UNIT64(sizeof(*id) + PFKEY_ALIGN8(fqdnlen));
- id->sadb_ident_exttype = idexttype;
- id->sadb_ident_type = SADB_IDENTTYPE_FQDN;
- bcopy(fqdn, id + 1, fqdnlen);
- p += sizeof(struct sadb_ident) + PFKEY_ALIGN8(fqdnlen);
- }
-
- if (idexttype) {
- /* create identity extension (USERFQDN) */
- struct sadb_ident *id;
- int userfqdnlen;
-
- if (userfqdn) {
- /* +1 for terminating-NUL */
- userfqdnlen = strlen(userfqdn) + 1;
- } else {
- userfqdnlen = 0;
- }
- id = (struct sadb_ident *)p;
- bzero(id, sizeof(*id) + PFKEY_ALIGN8(userfqdnlen));
- id->sadb_ident_len = PFKEY_UNIT64(sizeof(*id) + PFKEY_ALIGN8(userfqdnlen));
- id->sadb_ident_exttype = idexttype;
- id->sadb_ident_type = SADB_IDENTTYPE_USERFQDN;
- /* XXX is it correct? */
- if (curproc && curproc->p_cred) {
- id->sadb_ident_id = curproc->p_cred->p_ruid;
- }
- if (userfqdn && userfqdnlen) {
- bcopy(userfqdn, id + 1, userfqdnlen);
- }
- p += sizeof(struct sadb_ident) + PFKEY_ALIGN8(userfqdnlen);
- }
-#endif
-
/* XXX sensitivity (optional) */
/* create proposal/combination extension */
result->m_pkthdr.len += m->m_len;
}
+ VERIFY(PFKEY_UNIT64(result->m_pkthdr.len) <= UINT16_MAX);
mtod(result, struct sadb_msg *)->sadb_msg_len =
- PFKEY_UNIT64(result->m_pkthdr.len);
+ (u_int16_t)PFKEY_UNIT64(result->m_pkthdr.len);
return key_sendup_mbuf(NULL, result, KEY_SENDUP_REGISTERED);
dst0 = (const struct sadb_address *)mhp->ext[SADB_EXT_ADDRESS_DST];
ipsec_if = key_get_ipsec_if_from_message(mhp, SADB_X_EXT_IPSECIF);
+ u_int ipsec_if_index = 0;
+ if (ipsec_if != NULL) {
+ ipsec_if_index = ipsec_if->if_index;
+ ifnet_release(ipsec_if);
+ ipsec_if = NULL;
+ }
+
/* XXX boundary check against sa_len */
/* cast warnings */
- KEY_SETSECASIDX(proto, IPSEC_MODE_ANY, 0, src0 + 1, dst0 + 1, ipsec_if ? ipsec_if->if_index : 0, &saidx);
+ KEY_SETSECASIDX(proto, IPSEC_MODE_ANY, 0, src0 + 1, dst0 + 1, ipsec_if_index, &saidx);
/* get a SA index */
LIST_FOREACH(sah, &sahtree, chain) {
struct mbuf *n;
struct sadb_msg *newmsg;
struct sadb_supported *sup;
- u_int len, alen, elen;
+ u_int16_t len, alen, elen;
int off;
- int i;
+ u_int8_t i;
struct sadb_alg *alg;
/* create new sadb_msg to reply. */
m_copydata(m, 0, sizeof(struct sadb_msg), mtod(n, caddr_t) + off);
newmsg = mtod(n, struct sadb_msg *);
newmsg->sadb_msg_errno = 0;
- newmsg->sadb_msg_len = PFKEY_UNIT64(len);
+ VERIFY(PFKEY_UNIT64(len) <= UINT16_MAX);
+ newmsg->sadb_msg_len = (u_int16_t)PFKEY_UNIT64(len);
off += PFKEY_ALIGN8(sizeof(struct sadb_msg));
/* for authentication algorithm */
if (alen) {
sup = (struct sadb_supported *)(void *)(mtod(n, caddr_t) + off);
- sup->sadb_supported_len = PFKEY_UNIT64(alen);
+ sup->sadb_supported_len = (u_int16_t)PFKEY_UNIT64(alen);
sup->sadb_supported_exttype = SADB_EXT_SUPPORTED_AUTH;
off += PFKEY_ALIGN8(sizeof(*sup));
* give NULL to get the value preferred by
* algorithm XXX SADB_X_EXT_DERIV ?
*/
+ VERIFY((*ealgo->ivlen)(ealgo, NULL) <= UINT8_MAX);
alg->sadb_alg_ivlen =
- (*ealgo->ivlen)(ealgo, NULL);
+ (u_int8_t)((*ealgo->ivlen)(ealgo, NULL));
} else {
alg->sadb_alg_ivlen = 0;
}
key_expire(
struct secasvar *sav)
{
- int satype;
+ u_int8_t satype;
struct mbuf *result = NULL, *m;
int len;
int error = -1;
}
/* set msg header */
- m = key_setsadbmsg(SADB_EXPIRE, 0, satype, sav->seq, 0, sav->refcnt);
+ m = key_setsadbmsg(SADB_EXPIRE, 0, satype, sav->seq, 0, (u_int16_t)sav->refcnt);
if (!m) {
error = ENOBUFS;
goto fail;
result->m_pkthdr.len += m->m_len;
}
+ VERIFY(PFKEY_UNIT64(result->m_pkthdr.len) <= UINT16_MAX);
mtod(result, struct sadb_msg *)->sadb_msg_len =
- PFKEY_UNIT64(result->m_pkthdr.len);
+ (u_int16_t)PFKEY_UNIT64(result->m_pkthdr.len);
return key_sendup_mbuf(NULL, result, KEY_SENDUP_REGISTERED);
struct secashead *sah, *nextsah;
struct secasvar *sav, *nextsav;
u_int16_t proto;
- u_int8_t state;
+ u_int state;
u_int stateidx;
/* sanity check */
m->m_pkthdr.len = m->m_len = sizeof(struct sadb_msg);
newmsg = mtod(m, struct sadb_msg *);
newmsg->sadb_msg_errno = 0;
- newmsg->sadb_msg_len = PFKEY_UNIT64(m->m_pkthdr.len);
+ VERIFY(PFKEY_UNIT64(m->m_pkthdr.len) <= UINT16_MAX);
+ newmsg->sadb_msg_len = (uint16_t)PFKEY_UNIT64(m->m_pkthdr.len);
return key_sendup_mbuf(so, m, KEY_SENDUP_ALL);
}
u_int16_t proto;
u_int stateidx;
u_int8_t satype;
- u_int8_t state;
+ u_int state;
struct mbuf *n;
int error = 0;
if (msg->sadb_msg_type == SADB_X_PROMISC) {
break;
}
- /*FALLTHROUGH*/
+ OS_FALLTHROUGH;
default:
ipseclog((LOG_DEBUG, "key_parse: invalid type %u is passed.\n",
msg->sadb_msg_satype));
} else {
bzero_mbuf(m);
}
- msg->sadb_msg_errno = error;
+ msg->sadb_msg_errno = (u_int8_t)error;
return key_sendup_mbuf(so, m, target);
}
}
msg = mtod(m, struct sadb_msg *);
- msg->sadb_msg_errno = code;
+ msg->sadb_msg_errno = (u_int8_t)code;
return key_sendup_mbuf(so, m, KEY_SENDUP_ONE);
}
{
struct mbuf *n;
struct sadb_ext *ext;
- size_t off, end;
- int extlen;
+ size_t end;
+ int off, extlen;
int toff;
/* sanity check */
mhp->ext[0] = (struct sadb_ext *)mhp->msg; /*XXX backward compat */
end = PFKEY_UNUNIT64(mhp->msg->sadb_msg_len);
- extlen = end; /*just in case extlen is not updated*/
+ extlen = (int)end; /*just in case extlen is not updated*/
for (off = sizeof(struct sadb_msg); off < end; off += extlen) {
n = m_pulldown(m, off, sizeof(struct sadb_ext), &toff);
if (!n) {
if (off + extlen > end) {
ipseclog((LOG_DEBUG,
"key_align: ext type %u invalid ext length %d "
- "offset %zu sadb message total len %zu is passed.\n",
+ "offset %d sadb message total len %zu is passed.\n",
ext->sadb_ext_type, extlen, off, end));
bzero_mbuf(m);
m_freem(m);
n->m_next = NULL;
n->m_len = 0;
- n->m_len = M_TRAILINGSPACE(n);
+ n->m_len = (int)M_TRAILINGSPACE(n);
/* use the bottom of mbuf, hoping we can prepend afterwards */
if (n->m_len > len) {
t = (n->m_len - len) & ~(sizeof(long) - 1);
result->m_pkthdr.len += m->m_len;
}
+ if (PFKEY_UNIT64(result->m_pkthdr.len) > UINT16_MAX) {
+ ipseclog((LOG_ERR, "key_setdumpsastats: length too nbug: %u", result->m_pkthdr.len));
+ goto fail;
+ }
+
mtod(result, struct sadb_msg *)->sadb_msg_len =
- PFKEY_UNIT64(result->m_pkthdr.len);
+ (u_int16_t)PFKEY_UNIT64(result->m_pkthdr.len);
return result;
const struct sadb_msghdr *mhp)
{
struct sadb_session_id *session_id;
- u_int64_t bufsize = 0;
+ size_t bufsize = 0;
u_int32_t arg_count, res_count;
struct sadb_sastat *sa_stats_arg;
struct sastat *sa_stats_sav = NULL;
result->m_pkthdr.len += m->m_len;
}
- mtod(result, struct sadb_msg *)->sadb_msg_len = PFKEY_UNIT64(result->m_pkthdr.len);
+ if (PFKEY_UNIT64(result->m_pkthdr.len) >= UINT16_MAX) {
+ ipseclog((LOG_ERR, "key_send_delsp: length too big: %d", result->m_pkthdr.len));
+ goto fail;
+ }
+
+ mtod(result, struct sadb_msg *)->sadb_msg_len = (u_int16_t)PFKEY_UNIT64(result->m_pkthdr.len);
return key_sendup_mbuf(NULL, result, KEY_SENDUP_REGISTERED);
projects / apple / xnu.git / blobdiff