X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/316670eb35587141e969394ae8537d66b9211e80..c6bf4f310a33a9262d455ea4d3f0630b1255e3fe:/bsd/netkey/key.c diff --git a/bsd/netkey/key.c b/bsd/netkey/key.c index d1d59cd6f..b7c473e6a 100644 --- a/bsd/netkey/key.c +++ b/bsd/netkey/key.c @@ -1,8 +1,8 @@ /* - * Copyright (c) 2008-2011 Apple Inc. All rights reserved. + * Copyright (c) 2008-2016 Apple Inc. All rights reserved. * * @APPLE_OSREFERENCE_LICENSE_HEADER_START@ - * + * * This file contains Original Code and/or Modifications of Original Code * as defined in and that are subject to the Apple Public Source License * Version 2.0 (the 'License'). You may not use this file except in @@ -11,10 +11,10 @@ * unlawful or unlicensed copies of an Apple operating system, or to * circumvent, violate, or enable the circumvention or violation of, any * terms of an Apple operating system software license agreement. - * + * * Please obtain a copy of the License at * http://www.opensource.apple.com/apsl/ and read it before using this file. - * + * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, @@ -22,7 +22,7 @@ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. * Please see the License for the specific language governing rights and * limitations under the License. - * + * * @APPLE_OSREFERENCE_LICENSE_HEADER_END@ */ @@ -97,20 +97,13 @@ #include #endif /* INET6 */ -#if INET -#include -#endif -#if INET6 -#include -#endif /* INET6 */ - #include #include #include #include #include #include - +#include #include #if INET6 @@ -126,10 +119,6 @@ #include #endif #endif -#include -#if INET6 -#include -#endif /* randomness */ @@ -137,7 +126,7 @@ #include -#define FULLMASK 0xff +#define FULLMASK 0xff lck_grp_t *sadb_mutex_grp; lck_grp_attr_t *sadb_mutex_grp_attr; @@ -163,36 +152,38 @@ lck_mtx_t *pfkey_stat_mutex = &pfkey_stat_mutex_data; */ u_int32_t key_debug_level = 0; //### our sysctl is not dynamic +static int key_timehandler_running = 0; static u_int key_spi_trycnt = 1000; static u_int32_t key_spi_minval = 0x100; -static u_int32_t key_spi_maxval = 0x0fffffff; /* XXX */ +static u_int32_t key_spi_maxval = 0x0fffffff; /* XXX */ static u_int32_t policy_id = 0; -static u_int key_int_random = 60; /*interval to initialize randseed,1(m)*/ -static u_int key_larval_lifetime = 30; /* interval to expire acquiring, 30(s)*/ -static int key_blockacq_count = 10; /* counter for blocking SADB_ACQUIRE.*/ -static int key_blockacq_lifetime = 20; /* lifetime for blocking SADB_ACQUIRE.*/ -static int key_preferred_oldsa = 0; /* preferred old sa rather than new sa.*/ -__private_extern__ int natt_keepalive_interval = 20; /* interval between natt keepalives.*/ +static u_int key_int_random = 60; /*interval to initialize randseed,1(m)*/ +static u_int key_larval_lifetime = 30; /* interval to expire acquiring, 30(s)*/ +static int key_blockacq_count = 10; /* counter for blocking SADB_ACQUIRE.*/ +static int key_blockacq_lifetime = 20; /* lifetime for blocking SADB_ACQUIRE.*/ +static int key_preferred_oldsa = 0; /* preferred old sa rather than new sa.*/ +__private_extern__ int natt_keepalive_interval = 20; /* interval between natt keepalives.*/ __private_extern__ int ipsec_policy_count = 0; static int ipsec_sav_count = 0; static u_int32_t acq_seq = 0; static int key_tick_init_random = 0; -__private_extern__ u_int32_t natt_now = 0; +static u_int64_t up_time = 0; +__private_extern__ u_int64_t natt_now = 0; -static LIST_HEAD(_sptree, secpolicy) sptree[IPSEC_DIR_MAX]; /* SPD */ -static LIST_HEAD(_sahtree, secashead) sahtree; /* SAD */ +static LIST_HEAD(_sptree, secpolicy) sptree[IPSEC_DIR_MAX]; /* SPD */ +static LIST_HEAD(_sahtree, secashead) sahtree; /* SAD */ static LIST_HEAD(_regtree, secreg) regtree[SADB_SATYPE_MAX + 1]; - /* registed list */ - -#define SPIHASHSIZE 128 -#define SPIHASH(x) (((x) ^ ((x) >> 16)) % SPIHASHSIZE) +/* registed list */ + +#define SPIHASHSIZE 128 +#define SPIHASH(x) (((x) ^ ((x) >> 16)) % SPIHASHSIZE) static LIST_HEAD(_spihash, secasvar) spihash[SPIHASHSIZE]; #ifndef IPSEC_NONBLOCK_ACQUIRE -static LIST_HEAD(_acqtree, secacq) acqtree; /* acquiring list */ +static LIST_HEAD(_acqtree, secacq) acqtree; /* acquiring list */ #endif -static LIST_HEAD(_spacqtree, secspacq) spacqtree; /* SP acquiring list */ +static LIST_HEAD(_spacqtree, secspacq) spacqtree; /* SP acquiring list */ struct key_cb key_cb; @@ -213,52 +204,68 @@ static const u_int saorder_state_any[] = { }; static const int minsize[] = { - sizeof(struct sadb_msg), /* SADB_EXT_RESERVED */ - sizeof(struct sadb_sa), /* SADB_EXT_SA */ - sizeof(struct sadb_lifetime), /* SADB_EXT_LIFETIME_CURRENT */ - sizeof(struct sadb_lifetime), /* SADB_EXT_LIFETIME_HARD */ - sizeof(struct sadb_lifetime), /* SADB_EXT_LIFETIME_SOFT */ - sizeof(struct sadb_address), /* SADB_EXT_ADDRESS_SRC */ - sizeof(struct sadb_address), /* SADB_EXT_ADDRESS_DST */ - sizeof(struct sadb_address), /* SADB_EXT_ADDRESS_PROXY */ - sizeof(struct sadb_key), /* SADB_EXT_KEY_AUTH */ - sizeof(struct sadb_key), /* SADB_EXT_KEY_ENCRYPT */ - sizeof(struct sadb_ident), /* SADB_EXT_IDENTITY_SRC */ - sizeof(struct sadb_ident), /* SADB_EXT_IDENTITY_DST */ - sizeof(struct sadb_sens), /* SADB_EXT_SENSITIVITY */ - sizeof(struct sadb_prop), /* SADB_EXT_PROPOSAL */ - sizeof(struct sadb_supported), /* SADB_EXT_SUPPORTED_AUTH */ - sizeof(struct sadb_supported), /* SADB_EXT_SUPPORTED_ENCRYPT */ - sizeof(struct sadb_spirange), /* SADB_EXT_SPIRANGE */ - 0, /* SADB_X_EXT_KMPRIVATE */ - sizeof(struct sadb_x_policy), /* SADB_X_EXT_POLICY */ - sizeof(struct sadb_x_sa2), /* SADB_X_SA2 */ + sizeof(struct sadb_msg), /* SADB_EXT_RESERVED */ + sizeof(struct sadb_sa), /* SADB_EXT_SA */ + sizeof(struct sadb_lifetime), /* SADB_EXT_LIFETIME_CURRENT */ + sizeof(struct sadb_lifetime), /* SADB_EXT_LIFETIME_HARD */ + sizeof(struct sadb_lifetime), /* SADB_EXT_LIFETIME_SOFT */ + sizeof(struct sadb_address), /* SADB_EXT_ADDRESS_SRC */ + sizeof(struct sadb_address), /* SADB_EXT_ADDRESS_DST */ + sizeof(struct sadb_address), /* SADB_EXT_ADDRESS_PROXY */ + sizeof(struct sadb_key), /* SADB_EXT_KEY_AUTH */ + sizeof(struct sadb_key), /* SADB_EXT_KEY_ENCRYPT */ + sizeof(struct sadb_ident), /* SADB_EXT_IDENTITY_SRC */ + sizeof(struct sadb_ident), /* SADB_EXT_IDENTITY_DST */ + sizeof(struct sadb_sens), /* SADB_EXT_SENSITIVITY */ + sizeof(struct sadb_prop), /* SADB_EXT_PROPOSAL */ + sizeof(struct sadb_supported), /* SADB_EXT_SUPPORTED_AUTH */ + sizeof(struct sadb_supported), /* SADB_EXT_SUPPORTED_ENCRYPT */ + sizeof(struct sadb_spirange), /* SADB_EXT_SPIRANGE */ + 0, /* SADB_X_EXT_KMPRIVATE */ + sizeof(struct sadb_x_policy), /* SADB_X_EXT_POLICY */ + sizeof(struct sadb_x_sa2), /* SADB_X_SA2 */ sizeof(struct sadb_session_id), /* SADB_EXT_SESSION_ID */ sizeof(struct sadb_sastat), /* SADB_EXT_SASTAT */ + sizeof(struct sadb_x_ipsecif), /* SADB_X_EXT_IPSECIF */ + sizeof(struct sadb_address), /* SADB_X_EXT_ADDR_RANGE_SRC_START */ + sizeof(struct sadb_address), /* SADB_X_EXT_ADDR_RANGE_SRC_END */ + sizeof(struct sadb_address), /* SADB_X_EXT_ADDR_RANGE_DST_START */ + sizeof(struct sadb_address), /* SADB_X_EXT_ADDR_RANGE_DST_END */ + sizeof(struct sadb_address), /* SADB_EXT_MIGRATE_ADDRESS_SRC */ + sizeof(struct sadb_address), /* SADB_EXT_MIGRATE_ADDRESS_DST */ + sizeof(struct sadb_x_ipsecif), /* SADB_X_EXT_MIGRATE_IPSECIF */ }; static const int maxsize[] = { - sizeof(struct sadb_msg), /* SADB_EXT_RESERVED */ - sizeof(struct sadb_sa_2), /* SADB_EXT_SA */ - sizeof(struct sadb_lifetime), /* SADB_EXT_LIFETIME_CURRENT */ - sizeof(struct sadb_lifetime), /* SADB_EXT_LIFETIME_HARD */ - sizeof(struct sadb_lifetime), /* SADB_EXT_LIFETIME_SOFT */ - 0, /* SADB_EXT_ADDRESS_SRC */ - 0, /* SADB_EXT_ADDRESS_DST */ - 0, /* SADB_EXT_ADDRESS_PROXY */ - 0, /* SADB_EXT_KEY_AUTH */ - 0, /* SADB_EXT_KEY_ENCRYPT */ - 0, /* SADB_EXT_IDENTITY_SRC */ - 0, /* SADB_EXT_IDENTITY_DST */ - 0, /* SADB_EXT_SENSITIVITY */ - 0, /* SADB_EXT_PROPOSAL */ - 0, /* SADB_EXT_SUPPORTED_AUTH */ - 0, /* SADB_EXT_SUPPORTED_ENCRYPT */ - sizeof(struct sadb_spirange), /* SADB_EXT_SPIRANGE */ - 0, /* SADB_X_EXT_KMPRIVATE */ - 0, /* SADB_X_EXT_POLICY */ - sizeof(struct sadb_x_sa2), /* SADB_X_SA2 */ + sizeof(struct sadb_msg), /* SADB_EXT_RESERVED */ + sizeof(struct sadb_sa_2), /* SADB_EXT_SA */ + sizeof(struct sadb_lifetime), /* SADB_EXT_LIFETIME_CURRENT */ + sizeof(struct sadb_lifetime), /* SADB_EXT_LIFETIME_HARD */ + sizeof(struct sadb_lifetime), /* SADB_EXT_LIFETIME_SOFT */ + 0, /* SADB_EXT_ADDRESS_SRC */ + 0, /* SADB_EXT_ADDRESS_DST */ + 0, /* SADB_EXT_ADDRESS_PROXY */ + 0, /* SADB_EXT_KEY_AUTH */ + 0, /* SADB_EXT_KEY_ENCRYPT */ + 0, /* SADB_EXT_IDENTITY_SRC */ + 0, /* SADB_EXT_IDENTITY_DST */ + 0, /* SADB_EXT_SENSITIVITY */ + 0, /* SADB_EXT_PROPOSAL */ + 0, /* SADB_EXT_SUPPORTED_AUTH */ + 0, /* SADB_EXT_SUPPORTED_ENCRYPT */ + sizeof(struct sadb_spirange), /* SADB_EXT_SPIRANGE */ + 0, /* SADB_X_EXT_KMPRIVATE */ + 0, /* SADB_X_EXT_POLICY */ + sizeof(struct sadb_x_sa2), /* SADB_X_SA2 */ 0, /* SADB_EXT_SESSION_ID */ 0, /* SADB_EXT_SASTAT */ + sizeof(struct sadb_x_ipsecif), /* SADB_X_EXT_IPSECIF */ + 0, /* SADB_X_EXT_ADDR_RANGE_SRC_START */ + 0, /* SADB_X_EXT_ADDR_RANGE_SRC_END */ + 0, /* SADB_X_EXT_ADDR_RANGE_DST_START */ + 0, /* SADB_X_EXT_ADDR_RANGE_DST_END */ + 0, /* SADB_EXT_MIGRATE_ADDRESS_SRC */ + 0, /* SADB_EXT_MIGRATE_ADDRESS_DST */ + sizeof(struct sadb_x_ipsecif), /* SADB_X_EXT_MIGRATE_IPSECIF */ }; static int ipsec_esp_keymin = 256; @@ -267,153 +274,159 @@ static int ipsec_ah_keymin = 128; SYSCTL_DECL(_net_key); /* Thread safe: no accumulated state */ -SYSCTL_INT(_net_key, KEYCTL_DEBUG_LEVEL, debug, CTLFLAG_RW | CTLFLAG_LOCKED, \ - &key_debug_level, 0, ""); +SYSCTL_INT(_net_key, KEYCTL_DEBUG_LEVEL, debug, CTLFLAG_RW | CTLFLAG_LOCKED, \ + &key_debug_level, 0, ""); /* max count of trial for the decision of spi value */ -SYSCTL_INT(_net_key, KEYCTL_SPI_TRY, spi_trycnt, CTLFLAG_RW | CTLFLAG_LOCKED, \ - &key_spi_trycnt, 0, ""); +SYSCTL_INT(_net_key, KEYCTL_SPI_TRY, spi_trycnt, CTLFLAG_RW | CTLFLAG_LOCKED, \ + &key_spi_trycnt, 0, ""); /* minimum spi value to allocate automatically. */ -SYSCTL_INT(_net_key, KEYCTL_SPI_MIN_VALUE, spi_minval, CTLFLAG_RW | CTLFLAG_LOCKED, \ - &key_spi_minval, 0, ""); +SYSCTL_INT(_net_key, KEYCTL_SPI_MIN_VALUE, spi_minval, CTLFLAG_RW | CTLFLAG_LOCKED, \ + &key_spi_minval, 0, ""); /* maximun spi value to allocate automatically. */ -SYSCTL_INT(_net_key, KEYCTL_SPI_MAX_VALUE, spi_maxval, CTLFLAG_RW | CTLFLAG_LOCKED, \ - &key_spi_maxval, 0, ""); +SYSCTL_INT(_net_key, KEYCTL_SPI_MAX_VALUE, spi_maxval, CTLFLAG_RW | CTLFLAG_LOCKED, \ + &key_spi_maxval, 0, ""); /* interval to initialize randseed */ -SYSCTL_INT(_net_key, KEYCTL_RANDOM_INT, int_random, CTLFLAG_RW | CTLFLAG_LOCKED, \ - &key_int_random, 0, ""); +SYSCTL_INT(_net_key, KEYCTL_RANDOM_INT, int_random, CTLFLAG_RW | CTLFLAG_LOCKED, \ + &key_int_random, 0, ""); /* lifetime for larval SA; thread safe due to > compare */ -SYSCTL_INT(_net_key, KEYCTL_LARVAL_LIFETIME, larval_lifetime, CTLFLAG_RW | CTLFLAG_LOCKED, \ - &key_larval_lifetime, 0, ""); +SYSCTL_INT(_net_key, KEYCTL_LARVAL_LIFETIME, larval_lifetime, CTLFLAG_RW | CTLFLAG_LOCKED, \ + &key_larval_lifetime, 0, ""); /* counter for blocking to send SADB_ACQUIRE to IKEd */ -SYSCTL_INT(_net_key, KEYCTL_BLOCKACQ_COUNT, blockacq_count, CTLFLAG_RW | CTLFLAG_LOCKED, \ - &key_blockacq_count, 0, ""); +SYSCTL_INT(_net_key, KEYCTL_BLOCKACQ_COUNT, blockacq_count, CTLFLAG_RW | CTLFLAG_LOCKED, \ + &key_blockacq_count, 0, ""); /* lifetime for blocking to send SADB_ACQUIRE to IKEd: Thread safe, > compare */ -SYSCTL_INT(_net_key, KEYCTL_BLOCKACQ_LIFETIME, blockacq_lifetime, CTLFLAG_RW | CTLFLAG_LOCKED, \ - &key_blockacq_lifetime, 0, ""); +SYSCTL_INT(_net_key, KEYCTL_BLOCKACQ_LIFETIME, blockacq_lifetime, CTLFLAG_RW | CTLFLAG_LOCKED, \ + &key_blockacq_lifetime, 0, ""); /* ESP auth */ -SYSCTL_INT(_net_key, KEYCTL_ESP_AUTH, esp_auth, CTLFLAG_RW | CTLFLAG_LOCKED, \ - &ipsec_esp_auth, 0, ""); +SYSCTL_INT(_net_key, KEYCTL_ESP_AUTH, esp_auth, CTLFLAG_RW | CTLFLAG_LOCKED, \ + &ipsec_esp_auth, 0, ""); /* minimum ESP key length */ -SYSCTL_INT(_net_key, KEYCTL_ESP_KEYMIN, esp_keymin, CTLFLAG_RW | CTLFLAG_LOCKED, \ - &ipsec_esp_keymin, 0, ""); +SYSCTL_INT(_net_key, KEYCTL_ESP_KEYMIN, esp_keymin, CTLFLAG_RW | CTLFLAG_LOCKED, \ + &ipsec_esp_keymin, 0, ""); /* minimum AH key length */ -SYSCTL_INT(_net_key, KEYCTL_AH_KEYMIN, ah_keymin, CTLFLAG_RW | CTLFLAG_LOCKED, \ - &ipsec_ah_keymin, 0, ""); +SYSCTL_INT(_net_key, KEYCTL_AH_KEYMIN, ah_keymin, CTLFLAG_RW | CTLFLAG_LOCKED, \ + &ipsec_ah_keymin, 0, ""); /* perfered old SA rather than new SA */ -SYSCTL_INT(_net_key, KEYCTL_PREFERED_OLDSA, prefered_oldsa, CTLFLAG_RW | CTLFLAG_LOCKED,\ - &key_preferred_oldsa, 0, ""); +SYSCTL_INT(_net_key, KEYCTL_PREFERED_OLDSA, prefered_oldsa, CTLFLAG_RW | CTLFLAG_LOCKED, \ + &key_preferred_oldsa, 0, ""); /* time between NATT keepalives in seconds, 0 disabled */ -SYSCTL_INT(_net_key, KEYCTL_NATT_KEEPALIVE_INTERVAL, natt_keepalive_interval, CTLFLAG_RW | CTLFLAG_LOCKED,\ - &natt_keepalive_interval, 0, ""); +SYSCTL_INT(_net_key, KEYCTL_NATT_KEEPALIVE_INTERVAL, natt_keepalive_interval, CTLFLAG_RW | CTLFLAG_LOCKED, \ + &natt_keepalive_interval, 0, ""); /* PF_KEY statistics */ -SYSCTL_STRUCT(_net_key, KEYCTL_PFKEYSTAT, pfkeystat, CTLFLAG_RD | CTLFLAG_LOCKED,\ - &pfkeystat, pfkeystat, ""); +SYSCTL_STRUCT(_net_key, KEYCTL_PFKEYSTAT, pfkeystat, CTLFLAG_RD | CTLFLAG_LOCKED, \ + &pfkeystat, pfkeystat, ""); #ifndef LIST_FOREACH #define LIST_FOREACH(elm, head, field) \ - for (elm = LIST_FIRST(head); elm; elm = LIST_NEXT(elm, field)) +for (elm = LIST_FIRST(head); elm; elm = LIST_NEXT(elm, field)) #endif #define __LIST_CHAINED(elm) \ - (!((elm)->chain.le_next == NULL && (elm)->chain.le_prev == NULL)) +(!((elm)->chain.le_next == NULL && (elm)->chain.le_prev == NULL)) #define LIST_INSERT_TAIL(head, elm, type, field) \ do {\ - struct type *curelm = LIST_FIRST(head); \ - if (curelm == NULL) {\ - LIST_INSERT_HEAD(head, elm, field); \ - } else { \ - while (LIST_NEXT(curelm, field)) \ - curelm = LIST_NEXT(curelm, field);\ - LIST_INSERT_AFTER(curelm, elm, field);\ - }\ +struct type *curelm = LIST_FIRST(head); \ +if (curelm == NULL) {\ +LIST_INSERT_HEAD(head, elm, field); \ +} else { \ +while (LIST_NEXT(curelm, field)) \ +curelm = LIST_NEXT(curelm, field);\ +LIST_INSERT_AFTER(curelm, elm, field);\ +}\ } while (0) #define KEY_CHKSASTATE(head, sav, name) \ do { \ - if ((head) != (sav)) { \ - ipseclog((LOG_DEBUG, "%s: state mismatched (TREE=%d SA=%d)\n", \ - (name), (head), (sav))); \ - continue; \ - } \ +if ((head) != (sav)) { \ +ipseclog((LOG_DEBUG, "%s: state mismatched (TREE=%d SA=%d)\n", \ +(name), (head), (sav))); \ +continue; \ +} \ } while (0) #define KEY_CHKSPDIR(head, sp, name) \ do { \ - if ((head) != (sp)) { \ - ipseclog((LOG_DEBUG, "%s: direction mismatched (TREE=%d SP=%d), " \ - "anyway continue.\n", \ - (name), (head), (sp))); \ - } \ +if ((head) != (sp)) { \ +ipseclog((LOG_DEBUG, "%s: direction mismatched (TREE=%d SP=%d), " \ +"anyway continue.\n", \ +(name), (head), (sp))); \ +} \ } while (0) #if 1 #define KMALLOC_WAIT(p, t, n) \ - ((p) = (t) _MALLOC((u_int32_t)(n), M_SECA, M_WAITOK)) +((p) = (t) _MALLOC((u_int32_t)(n), M_SECA, M_WAITOK)) #define KMALLOC_NOWAIT(p, t, n) \ - ((p) = (t) _MALLOC((u_int32_t)(n), M_SECA, M_NOWAIT)) +((p) = (t) _MALLOC((u_int32_t)(n), M_SECA, M_NOWAIT)) #define KFREE(p) \ - _FREE((caddr_t)(p), M_SECA); +_FREE((caddr_t)(p), M_SECA); #else #define KMALLOC_WAIT(p, t, n) \ do { \ - ((p) = (t)_MALLOC((u_int32_t)(n), M_SECA, M_WAITOK)); \ - printf("%s %d: %p <- KMALLOC_WAIT(%s, %d)\n", \ - __FILE__, __LINE__, (p), #t, n); \ +((p) = (t)_MALLOC((u_int32_t)(n), M_SECA, M_WAITOK)); \ +printf("%s %d: %p <- KMALLOC_WAIT(%s, %d)\n", \ +__FILE__, __LINE__, (p), #t, n); \ } while (0) #define KMALLOC_NOWAIT(p, t, n) \ - do { \ - ((p) = (t)_MALLOC((u_int32_t)(n), M_SECA, M_NOWAIT)); \ - printf("%s %d: %p <- KMALLOC_NOWAIT(%s, %d)\n", \ - __FILE__, __LINE__, (p), #t, n); \ - } while (0) +do { \ +((p) = (t)_MALLOC((u_int32_t)(n), M_SECA, M_NOWAIT)); \ +printf("%s %d: %p <- KMALLOC_NOWAIT(%s, %d)\n", \ +__FILE__, __LINE__, (p), #t, n); \ +} while (0) #define KFREE(p) \ - do { \ - printf("%s %d: %p -> KFREE()\n", __FILE__, __LINE__, (p)); \ - _FREE((caddr_t)(p), M_SECA); \ - } while (0) +do { \ +printf("%s %d: %p -> KFREE()\n", __FILE__, __LINE__, (p)); \ +_FREE((caddr_t)(p), M_SECA); \ +} while (0) #endif /* * set parameters into secpolicyindex buffer. * Must allocate secpolicyindex buffer passed to this function. */ -#define KEY_SETSECSPIDX(_dir, s, d, ps, pd, ulp, idx) \ +#define KEY_SETSECSPIDX(_dir, s, d, ps, pd, ulp, ifp, s_s, s_e, d_s, d_e, idx) \ do { \ - bzero((idx), sizeof(struct secpolicyindex)); \ - (idx)->dir = (_dir); \ - (idx)->prefs = (ps); \ - (idx)->prefd = (pd); \ - (idx)->ul_proto = (ulp); \ - bcopy((s), &(idx)->src, ((struct sockaddr *)(s))->sa_len); \ - bcopy((d), &(idx)->dst, ((struct sockaddr *)(d))->sa_len); \ +bzero((idx), sizeof(struct secpolicyindex)); \ +(idx)->dir = (_dir); \ +(idx)->prefs = (ps); \ +(idx)->prefd = (pd); \ +(idx)->ul_proto = (ulp); \ +(idx)->internal_if = (ifp); \ +if (s) bcopy((s), &(idx)->src, ((struct sockaddr *)(s))->sa_len); \ +if (d) bcopy((d), &(idx)->dst, ((struct sockaddr *)(d))->sa_len); \ +if (s_s) bcopy((s_s), &(idx)->src_range.start, ((struct sockaddr *)(s_s))->sa_len); \ +if (s_e) bcopy((s_e), &(idx)->src_range.end, ((struct sockaddr *)(s_e))->sa_len); \ +if (d_s) bcopy((d_s), &(idx)->dst_range.start, ((struct sockaddr *)(d_s))->sa_len); \ +if (d_e) bcopy((d_e), &(idx)->dst_range.end, ((struct sockaddr *)(d_e))->sa_len); \ } while (0) /* * set parameters into secasindex buffer. * Must allocate secasindex buffer before calling this function. */ -#define KEY_SETSECASIDX(p, m, r, s, d, idx) \ +#define KEY_SETSECASIDX(p, m, r, s, d, ifi, idx) \ do { \ - bzero((idx), sizeof(struct secasindex)); \ - (idx)->proto = (p); \ - (idx)->mode = (m); \ - (idx)->reqid = (r); \ - bcopy((s), &(idx)->src, ((const struct sockaddr *)(s))->sa_len); \ - bcopy((d), &(idx)->dst, ((const struct sockaddr *)(d))->sa_len); \ +bzero((idx), sizeof(struct secasindex)); \ +(idx)->proto = (p); \ +(idx)->mode = (m); \ +(idx)->reqid = (r); \ +bcopy((s), &(idx)->src, ((const struct sockaddr *)(s))->sa_len); \ +bcopy((d), &(idx)->dst, ((const struct sockaddr *)(d))->sa_len); \ +(idx)->ipsec_ifindex = (ifi); \ } while (0) /* key statistics */ @@ -428,55 +441,61 @@ struct sadb_msghdr { int extlen[SADB_EXT_MAX + 1]; }; +static struct secpolicy *__key_getspbyid(u_int32_t id); static struct secasvar *key_do_allocsa_policy(struct secashead *, u_int, u_int16_t); 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 struct secpolicy *key_getspbyid(u_int32_t); static u_int32_t key_newreqid(void); static struct mbuf *key_gather_mbuf(struct mbuf *, - const struct sadb_msghdr *, int, int, int *); + const struct sadb_msghdr *, int, int, int *); static int key_spdadd(struct socket *, struct mbuf *, - const struct sadb_msghdr *); + const struct sadb_msghdr *); static u_int32_t key_getnewspid(void); static int key_spddelete(struct socket *, struct mbuf *, - const struct sadb_msghdr *); + const struct sadb_msghdr *); static int key_spddelete2(struct socket *, struct mbuf *, - const struct sadb_msghdr *); + const struct sadb_msghdr *); +static int key_spdenable(struct socket *, struct mbuf *, + const struct sadb_msghdr *); +static int key_spddisable(struct socket *, struct mbuf *, + const struct sadb_msghdr *); static int key_spdget(struct socket *, struct mbuf *, - const struct sadb_msghdr *); + const struct sadb_msghdr *); static int key_spdflush(struct socket *, struct mbuf *, - const struct sadb_msghdr *); + const struct sadb_msghdr *); static int key_spddump(struct socket *, struct mbuf *, - const struct sadb_msghdr *); + const struct sadb_msghdr *); static struct mbuf *key_setdumpsp(struct secpolicy *, - u_int8_t, u_int32_t, u_int32_t); + u_int8_t, u_int32_t, u_int32_t); static u_int key_getspreqmsglen(struct secpolicy *); static int key_spdexpire(struct secpolicy *); -static struct secashead *key_newsah(struct secasindex *, u_int8_t); +static struct secashead *key_newsah(struct secasindex *, ifnet_t, u_int, u_int8_t); static struct secasvar *key_newsav(struct mbuf *, - const struct sadb_msghdr *, struct secashead *, int *); + const struct sadb_msghdr *, struct secashead *, int *, + struct socket *); static struct secashead *key_getsah(struct secasindex *); static struct secasvar *key_checkspidup(struct secasindex *, u_int32_t); static void key_setspi __P((struct secasvar *, u_int32_t)); static struct secasvar *key_getsavbyspi(struct secashead *, u_int32_t); static int key_setsaval(struct secasvar *, struct mbuf *, - const struct sadb_msghdr *); + const struct sadb_msghdr *); static int key_mature(struct secasvar *); static struct mbuf *key_setdumpsa(struct secasvar *, u_int8_t, - u_int8_t, u_int32_t, u_int32_t); + u_int8_t, u_int32_t, u_int32_t); static struct mbuf *key_setsadbmsg(u_int8_t, u_int16_t, u_int8_t, - u_int32_t, pid_t, u_int16_t); + 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); + 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); + int, u_int64_t); #endif -static struct mbuf *key_setsadbxsa2(u_int8_t, u_int32_t, u_int32_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); + u_int32_t); static void *key_newbuf(const void *, u_int); #if INET6 static int key_ismyaddr6(struct sockaddr_in6 *); @@ -484,37 +503,38 @@ static int key_ismyaddr6(struct sockaddr_in6 *); static void key_update_natt_keepalive_timestamp(struct secasvar *, struct secasvar *); /* flags for key_cmpsaidx() */ -#define CMP_HEAD 0x1 /* protocol, addresses. */ -#define CMP_PORT 0x2 /* additionally HEAD, reqid, mode. */ -#define CMP_REQID 0x4 /* additionally HEAD, reqid. */ +#define CMP_HEAD 0x1 /* protocol, addresses. */ +#define CMP_PORT 0x2 /* additionally HEAD, reqid, mode. */ +#define CMP_REQID 0x4 /* additionally HEAD, reqid. */ #define CMP_MODE 0x8 /* additionally mode. */ -#define CMP_EXACTLY 0xF /* all elements. */ +#define CMP_EXACTLY 0xF /* all elements. */ static int key_cmpsaidx(struct secasindex *, struct secasindex *, int); static int key_cmpspidx_exactly(struct secpolicyindex *, - struct secpolicyindex *); + struct secpolicyindex *); static int key_cmpspidx_withmask(struct secpolicyindex *, - struct secpolicyindex *); + struct secpolicyindex *); static int key_sockaddrcmp(struct sockaddr *, struct sockaddr *, int); +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_proto2satype(u_int16_t); static int key_getspi(struct socket *, struct mbuf *, - const struct sadb_msghdr *); + const struct sadb_msghdr *); static u_int32_t key_do_getnewspi(struct sadb_spirange *, struct secasindex *); static int key_update(struct socket *, struct mbuf *, - const struct sadb_msghdr *); + const struct sadb_msghdr *); #if IPSEC_DOSEQCHECK static struct secasvar *key_getsavbyseq(struct secashead *, u_int32_t); #endif static int key_add(struct socket *, struct mbuf *, const struct sadb_msghdr *); static int key_setident(struct secashead *, struct mbuf *, - const struct sadb_msghdr *); + 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 *); + const struct sadb_msghdr *); static int key_get(struct socket *, struct mbuf *, const struct sadb_msghdr *); static void key_getcomb_setlifetime(struct sadb_comb *); @@ -522,7 +542,6 @@ static void key_getcomb_setlifetime(struct sadb_comb *); static struct mbuf *key_getcomb_esp(void); #endif static struct mbuf *key_getcomb_ah(void); -static struct mbuf *key_getcomb_ipcomp(void); static struct mbuf *key_getprop(const struct secasindex *); static int key_acquire(struct secasindex *, struct secpolicy *); @@ -534,44 +553,45 @@ static struct secacq *key_getacqbyseq(u_int32_t); static struct secspacq *key_newspacq(struct secpolicyindex *); static struct secspacq *key_getspacq(struct secpolicyindex *); static int key_acquire2(struct socket *, struct mbuf *, - const struct sadb_msghdr *); + const struct sadb_msghdr *); static int key_register(struct socket *, struct mbuf *, - const struct sadb_msghdr *); + const struct sadb_msghdr *); static int key_expire(struct secasvar *); static int key_flush(struct socket *, struct mbuf *, - const struct sadb_msghdr *); + const struct sadb_msghdr *); static int key_dump(struct socket *, struct mbuf *, const struct sadb_msghdr *); static int key_promisc(struct socket *, struct mbuf *, - const struct sadb_msghdr *); + const struct sadb_msghdr *); static int key_senderror(struct socket *, struct mbuf *, int); static int key_validate_ext(const struct sadb_ext *, int); static int key_align(struct mbuf *, 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_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); + 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; extern int esp_udp_encap_port; int ipsec_send_natt_keepalive(struct secasvar *sav); +bool ipsec_fill_offload_frame(ifnet_t ifp, struct secasvar *sav, struct ifnet_keepalive_offload_frame *frame, size_t frame_data_offset); -void key_init(void); - - +void key_init(struct protosw *, struct domain *); /* * PF_KEY init @@ -579,30 +599,41 @@ void key_init(void); * */ void -key_init(void) +key_init(struct protosw *pp, struct domain *dp) { - + static int key_initialized = 0; int i; - + + VERIFY((pp->pr_flags & (PR_INITIALIZED | PR_ATTACHED)) == PR_ATTACHED); + + _CASSERT(PFKEY_ALIGN8(sizeof(struct sadb_msg)) <= _MHLEN); + _CASSERT(MAX_REPLAY_WINDOWS == MBUF_TC_MAX); + + if (key_initialized) { + return; + } + key_initialized = 1; + sadb_mutex_grp_attr = lck_grp_attr_alloc_init(); sadb_mutex_grp = lck_grp_alloc_init("sadb", sadb_mutex_grp_attr); sadb_mutex_attr = lck_attr_alloc_init(); lck_mtx_init(sadb_mutex, sadb_mutex_grp, sadb_mutex_attr); - + pfkey_stat_mutex_grp_attr = lck_grp_attr_alloc_init(); pfkey_stat_mutex_grp = lck_grp_alloc_init("pfkey_stat", pfkey_stat_mutex_grp_attr); pfkey_stat_mutex_attr = lck_attr_alloc_init(); lck_mtx_init(pfkey_stat_mutex, pfkey_stat_mutex_grp, pfkey_stat_mutex_attr); - for (i = 0; i < SPIHASHSIZE; i++) + for (i = 0; i < SPIHASHSIZE; i++) { LIST_INIT(&spihash[i]); + } - raw_init(); + raw_init(pp, dp); bzero((caddr_t)&key_cb, sizeof(key_cb)); - + for (i = 0; i < IPSEC_DIR_MAX; i++) { LIST_INIT(&sptree[i]); } @@ -623,25 +654,39 @@ key_init(void) /* system default */ #if INET ip4_def_policy.policy = IPSEC_POLICY_NONE; - ip4_def_policy.refcnt++; /*never reclaim this*/ + ip4_def_policy.refcnt++; /*never reclaim this*/ #endif #if INET6 ip6_def_policy.policy = IPSEC_POLICY_NONE; - ip6_def_policy.refcnt++; /*never reclaim this*/ + ip6_def_policy.refcnt++; /*never reclaim this*/ #endif -#ifndef IPSEC_DEBUG2 - timeout((void *)key_timehandler, (void *)0, hz); -#endif /*IPSEC_DEBUG2*/ + key_timehandler_running = 0; /* initialize key statistics */ keystat.getspi_count = 1; + esp_init(); #ifndef __APPLE__ printf("IPsec: Initialized Security Association Processing.\n"); #endif } +static void +key_start_timehandler(void) +{ + /* must be called while locked */ + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); + if (key_timehandler_running == 0) { + key_timehandler_running = 1; + (void)timeout((void *)key_timehandler, (void *)0, hz); + } + + /* Turn off the ipsec bypass */ + if (ipsec_bypass != 0) { + ipsec_bypass = 0; + } +} /* %%% IPsec policy management */ /* @@ -658,10 +703,11 @@ key_allocsp( struct secpolicy *sp; struct timeval tv; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); /* sanity check */ - if (spidx == NULL) + if (spidx == NULL) { panic("key_allocsp: NULL pointer is passed.\n"); + } /* check direction */ switch (dir) { @@ -674,19 +720,34 @@ key_allocsp( /* get a SP entry */ KEYDEBUG(KEYDEBUG_IPSEC_DATA, - printf("*** objects\n"); - kdebug_secpolicyindex(spidx)); + printf("*** objects\n"); + kdebug_secpolicyindex(spidx)); lck_mtx_lock(sadb_mutex); LIST_FOREACH(sp, &sptree[dir], chain) { KEYDEBUG(KEYDEBUG_IPSEC_DATA, - printf("*** in SPD\n"); - kdebug_secpolicyindex(&sp->spidx)); + printf("*** in SPD\n"); + kdebug_secpolicyindex(&sp->spidx)); + + if (sp->state == IPSEC_SPSTATE_DEAD) { + continue; + } - if (sp->state == IPSEC_SPSTATE_DEAD) + /* If the policy is disabled, skip */ + if (sp->disabled > 0) { continue; - if (key_cmpspidx_withmask(&sp->spidx, spidx)) + } + + /* If the incoming spidx specifies bound if, + * ignore unbound policies*/ + if (spidx->internal_if != NULL + && (sp->spidx.internal_if == NULL || sp->ipsec_if == NULL)) { + continue; + } + + if (key_cmpspidx_withmask(&sp->spidx, spidx)) { goto found; + } } lck_mtx_unlock(sadb_mutex); return NULL; @@ -698,12 +759,12 @@ found: sp->lastused = tv.tv_sec; sp->refcnt++; lck_mtx_unlock(sadb_mutex); - + /* sanity check */ KEY_CHKSPDIR(sp->spidx.dir, dir, "key_allocsp"); KEYDEBUG(KEYDEBUG_IPSEC_STAMP, - printf("DP key_allocsp cause refcnt++:%d SP:%p\n", - sp->refcnt, sp)); + printf("DP key_allocsp cause refcnt++:%d SP:0x%llx\n", + sp->refcnt, (uint64_t)VM_KERNEL_ADDRPERM(sp))); return sp; } @@ -727,19 +788,21 @@ key_gettunnel( if (isrc->sa_family != idst->sa_family) { ipseclog((LOG_ERR, "protocol family mismatched %d != %d\n.", - isrc->sa_family, idst->sa_family)); + isrc->sa_family, idst->sa_family)); return NULL; } lck_mtx_lock(sadb_mutex); LIST_FOREACH(sp, &sptree[dir], chain) { - if (sp->state == IPSEC_SPSTATE_DEAD) + if (sp->state == IPSEC_SPSTATE_DEAD) { continue; + } r1 = r2 = NULL; for (p = sp->req; p; p = p->next) { - if (p->saidx.mode != IPSEC_MODE_TUNNEL) + if (p->saidx.mode != IPSEC_MODE_TUNNEL) { continue; + } r1 = r2; r2 = p; @@ -748,25 +811,29 @@ key_gettunnel( /* here we look at address matches only */ spidx = sp->spidx; if (isrc->sa_len > sizeof(spidx.src) || - idst->sa_len > sizeof(spidx.dst)) + idst->sa_len > sizeof(spidx.dst)) { continue; + } bcopy(isrc, &spidx.src, isrc->sa_len); bcopy(idst, &spidx.dst, idst->sa_len); - if (!key_cmpspidx_withmask(&sp->spidx, &spidx)) - continue; + if (!key_cmpspidx_withmask(&sp->spidx, &spidx)) { + continue; + } } else { is = (struct sockaddr *)&r1->saidx.src; id = (struct sockaddr *)&r1->saidx.dst; if (key_sockaddrcmp(is, isrc, 0) || - key_sockaddrcmp(id, idst, 0)) + key_sockaddrcmp(id, idst, 0)) { continue; + } } os = (struct sockaddr *)&r2->saidx.src; od = (struct sockaddr *)&r2->saidx.dst; if (key_sockaddrcmp(os, osrc, 0) || - key_sockaddrcmp(od, odst, 0)) + key_sockaddrcmp(od, odst, 0)) { continue; + } goto found; } @@ -782,6 +849,92 @@ found: return sp; } +struct secasvar * +key_alloc_outbound_sav_for_interface(ifnet_t interface, int family, + struct sockaddr *src, + struct sockaddr *dst) +{ + struct secashead *sah; + struct secasvar *sav; + u_int stateidx; + u_int state; + const u_int *saorder_state_valid; + int arraysize; + struct sockaddr_in *sin; + u_int16_t dstport; + bool strict = true; + + if (interface == NULL) { + return NULL; + } + + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); + + lck_mtx_lock(sadb_mutex); + + do { + LIST_FOREACH(sah, &sahtree, chain) { + if (sah->state == SADB_SASTATE_DEAD) { + continue; + } + if (sah->ipsec_if == interface && + (family == AF_INET6 || family == AF_INET) && + sah->dir == IPSEC_DIR_OUTBOUND) { + if (strict && + sah->saidx.mode == IPSEC_MODE_TRANSPORT && + src != NULL && dst != NULL) { + // Validate addresses for transport mode + if (key_sockaddrcmp((struct sockaddr *)&sah->saidx.src, src, 0) != 0) { + // Source doesn't match + continue; + } + + if (key_sockaddrcmp((struct sockaddr *)&sah->saidx.dst, dst, 0) != 0) { + // Destination doesn't match + continue; + } + } + + /* This SAH is linked to the IPsec interface, and the right family. We found it! */ + if (key_preferred_oldsa) { + saorder_state_valid = saorder_state_valid_prefer_old; + arraysize = _ARRAYLEN(saorder_state_valid_prefer_old); + } else { + saorder_state_valid = saorder_state_valid_prefer_new; + arraysize = _ARRAYLEN(saorder_state_valid_prefer_new); + } + + sin = (struct sockaddr_in *)&sah->saidx.dst; + dstport = sin->sin_port; + if (sah->saidx.mode == IPSEC_MODE_TRANSPORT) { + sin->sin_port = IPSEC_PORT_ANY; + } + + for (stateidx = 0; stateidx < arraysize; stateidx++) { + state = saorder_state_valid[stateidx]; + sav = key_do_allocsa_policy(sah, state, dstport); + if (sav != NULL) { + lck_mtx_unlock(sadb_mutex); + return sav; + } + } + + break; + } + } + if (strict) { + // If we didn't find anything, try again without strict + strict = false; + } else { + // We already were on the second try, bail + break; + } + } while (true); + + lck_mtx_unlock(sadb_mutex); + return NULL; +} + /* * allocating an SA entry for an *OUTBOUND* packet. * checking each request entries in SP, and acquire an SA if need. @@ -791,20 +944,21 @@ found: int key_checkrequest( struct ipsecrequest *isr, - struct secasindex *saidx, + struct secasindex *saidx, struct secasvar **sav) { u_int level; int error; struct sockaddr_in *sin; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); - + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); + *sav = NULL; - + /* sanity check */ - if (isr == NULL || saidx == NULL) + if (isr == NULL || saidx == NULL) { panic("key_checkrequest: NULL pointer is passed.\n"); + } /* check mode */ switch (saidx->mode) { @@ -824,12 +978,14 @@ key_checkrequest( * key_allocsa_policy should allocate the oldest SA available. * See key_do_allocsa_policy(), and draft-jenkins-ipsec-rekeying-03.txt. */ - if (*sav == NULL) + if (*sav == NULL) { *sav = key_allocsa_policy(saidx); + } /* When there is SA. */ - if (*sav != NULL) + if (*sav != NULL) { return 0; + } /* There is no SA. * @@ -843,7 +999,7 @@ key_checkrequest( if ((error = key_acquire(saidx, isr->sp)) != 0) { /* XXX What should I do ? */ ipseclog((LOG_DEBUG, "key_checkrequest: error %d returned " - "from key_acquire.\n", error)); + "from key_acquire.\n", error)); return error; } @@ -868,21 +1024,23 @@ key_allocsa_policy( const u_int *saorder_state_valid; int arraysize; struct sockaddr_in *sin; - u_int16_t dstport; - + u_int16_t dstport; + lck_mtx_lock(sadb_mutex); sah_search_calls++; LIST_FOREACH(sah, &sahtree, chain) { - sah_search_count++; - if (sah->state == SADB_SASTATE_DEAD) + sah_search_count++; + if (sah->state == SADB_SASTATE_DEAD) { continue; - if (key_cmpsaidx(&sah->saidx, saidx, CMP_MODE | CMP_REQID)) + } + if (key_cmpsaidx(&sah->saidx, saidx, CMP_MODE | CMP_REQID)) { goto found; + } } lck_mtx_unlock(sadb_mutex); return NULL; - found: +found: /* * search a valid state list for outbound packet. @@ -899,11 +1057,11 @@ key_allocsa_policy( sin = (struct sockaddr_in *)&saidx->dst; dstport = sin->sin_port; - if (saidx->mode == IPSEC_MODE_TRANSPORT) + if (saidx->mode == IPSEC_MODE_TRANSPORT) { sin->sin_port = IPSEC_PORT_ANY; + } for (stateidx = 0; stateidx < arraysize; stateidx++) { - state = saorder_state_valid[stateidx]; sav = key_do_allocsa_policy(sah, state, dstport); @@ -916,6 +1074,75 @@ key_allocsa_policy( return NULL; } +static void +key_send_delete(struct secasvar *sav) +{ + struct mbuf *m, *result; + u_int8_t satype; + + key_sa_chgstate(sav, SADB_SASTATE_DEAD); + + if ((satype = key_proto2satype(sav->sah->saidx.proto)) == 0) { + panic("key_do_allocsa_policy: invalid proto is passed.\n"); + } + + m = key_setsadbmsg(SADB_DELETE, 0, + satype, 0, 0, sav->refcnt - 1); + if (!m) { + goto msgfail; + } + result = m; + + /* set sadb_address for saidx's. */ + m = key_setsadbaddr(SADB_EXT_ADDRESS_SRC, + (struct sockaddr *)&sav->sah->saidx.src, + sav->sah->saidx.src.ss_len << 3, + IPSEC_ULPROTO_ANY); + if (!m) { + goto msgfail; + } + m_cat(result, m); + + /* set sadb_address for saidx's. */ + m = key_setsadbaddr(SADB_EXT_ADDRESS_DST, + (struct sockaddr *)&sav->sah->saidx.dst, + sav->sah->saidx.src.ss_len << 3, + IPSEC_ULPROTO_ANY); + if (!m) { + goto msgfail; + } + m_cat(result, m); + + /* create SA extension */ + m = key_setsadbsa(sav); + if (!m) { + goto msgfail; + } + m_cat(result, m); + + if (result->m_len < sizeof(struct sadb_msg)) { + result = m_pullup(result, + sizeof(struct sadb_msg)); + if (result == NULL) { + goto msgfail; + } + } + + result->m_pkthdr.len = 0; + for (m = result; m; m = m->m_next) { + result->m_pkthdr.len += m->m_len; + } + mtod(result, struct sadb_msg *)->sadb_msg_len = + PFKEY_UNIT64(result->m_pkthdr.len); + + if (key_sendup_mbuf(NULL, result, + KEY_SENDUP_REGISTERED)) { + goto msgfail; + } +msgfail: + key_freesav(sav, KEY_SADB_LOCKED); +} + /* * searching SAD with direction, protocol, mode and state. * called by key_allocsa_policy(). @@ -931,7 +1158,7 @@ key_do_allocsa_policy( { struct secasvar *sav, *nextsav, *candidate, *natt_candidate, *no_natt_candidate, *d; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED); + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); /* initialize */ candidate = NULL; @@ -939,9 +1166,8 @@ key_do_allocsa_policy( no_natt_candidate = NULL; for (sav = LIST_FIRST(&sah->savtree[state]); - sav != NULL; - sav = nextsav) { - + sav != NULL; + sav = nextsav) { nextsav = LIST_NEXT(sav, chain); /* sanity check */ @@ -949,61 +1175,71 @@ key_do_allocsa_policy( if (sah->saidx.mode == IPSEC_MODE_TUNNEL && dstport && ((sav->flags & SADB_X_EXT_NATT) != 0) && - ntohs(dstport) != sav->remote_ike_port) + ntohs(dstport) != sav->remote_ike_port) { continue; - + } + if (sah->saidx.mode == IPSEC_MODE_TRANSPORT && ((sav->flags & SADB_X_EXT_NATT_MULTIPLEUSERS) != 0) && - ntohs(dstport) != sav->remote_ike_port) - continue; /* skip this one - not a match - or not UDP */ - + ntohs(dstport) != sav->remote_ike_port) { + continue; /* skip this one - not a match - or not UDP */ + } if ((sah->saidx.mode == IPSEC_MODE_TUNNEL && - ((sav->flags & SADB_X_EXT_NATT) != 0)) || + ((sav->flags & SADB_X_EXT_NATT) != 0)) || (sah->saidx.mode == IPSEC_MODE_TRANSPORT && - ((sav->flags & SADB_X_EXT_NATT_MULTIPLEUSERS) != 0))) { + ((sav->flags & SADB_X_EXT_NATT_MULTIPLEUSERS) != 0))) { if (natt_candidate == NULL) { natt_candidate = sav; continue; - } else + } else { candidate = natt_candidate; + } } else { if (no_natt_candidate == NULL) { no_natt_candidate = sav; continue; - } else + } else { candidate = no_natt_candidate; - } + } + } /* Which SA is the better ? */ /* sanity check 2 */ - if (candidate->lft_c == NULL || sav->lft_c == NULL) + if (candidate->lft_c == NULL || sav->lft_c == NULL) { panic("key_do_allocsa_policy: " - "lifetime_current is NULL.\n"); + "lifetime_current is NULL.\n"); + } /* What the best method is to compare ? */ if (key_preferred_oldsa) { if (candidate->lft_c->sadb_lifetime_addtime > - sav->lft_c->sadb_lifetime_addtime) { - if ((sav->flags & SADB_X_EXT_NATT_MULTIPLEUSERS) != 0) + sav->lft_c->sadb_lifetime_addtime) { + if ((sav->flags & SADB_X_EXT_NATT_MULTIPLEUSERS) != 0) { natt_candidate = sav; - else + } else { no_natt_candidate = sav; } + } continue; /*NOTREACHED*/ } /* prefered new sa rather than old sa */ if (candidate->lft_c->sadb_lifetime_addtime < - sav->lft_c->sadb_lifetime_addtime) { + sav->lft_c->sadb_lifetime_addtime) { d = candidate; - if ((sav->flags & SADB_X_EXT_NATT_MULTIPLEUSERS) != 0) + if ((sah->saidx.mode == IPSEC_MODE_TUNNEL && + ((sav->flags & SADB_X_EXT_NATT) != 0)) || + (sah->saidx.mode == IPSEC_MODE_TRANSPORT && + ((sav->flags & SADB_X_EXT_NATT_MULTIPLEUSERS) != 0))) { natt_candidate = sav; - else + } else { no_natt_candidate = sav; - } else + } + } else { d = sav; + } /* * prepared to delete the SA when there is more @@ -1011,80 +1247,30 @@ key_do_allocsa_policy( * permanent. */ if (d->lft_c->sadb_lifetime_addtime != 0) { - struct mbuf *m, *result; - - key_sa_chgstate(d, SADB_SASTATE_DEAD); - - m = key_setsadbmsg(SADB_DELETE, 0, - d->sah->saidx.proto, 0, 0, d->refcnt - 1); - if (!m) - goto msgfail; - result = m; - - /* set sadb_address for saidx's. */ - m = key_setsadbaddr(SADB_EXT_ADDRESS_SRC, - (struct sockaddr *)&d->sah->saidx.src, - d->sah->saidx.src.ss_len << 3, - IPSEC_ULPROTO_ANY); - if (!m) - goto msgfail; - m_cat(result, m); - - /* set sadb_address for saidx's. */ - m = key_setsadbaddr(SADB_EXT_ADDRESS_DST, - (struct sockaddr *)&d->sah->saidx.src, - d->sah->saidx.src.ss_len << 3, - IPSEC_ULPROTO_ANY); - if (!m) - goto msgfail; - m_cat(result, m); - - /* create SA extension */ - m = key_setsadbsa(d); - if (!m) - goto msgfail; - m_cat(result, m); - - if (result->m_len < sizeof(struct sadb_msg)) { - result = m_pullup(result, - sizeof(struct sadb_msg)); - if (result == NULL) - goto msgfail; - } - - result->m_pkthdr.len = 0; - for (m = result; m; m = m->m_next) - result->m_pkthdr.len += m->m_len; - mtod(result, struct sadb_msg *)->sadb_msg_len = - PFKEY_UNIT64(result->m_pkthdr.len); - - if (key_sendup_mbuf(NULL, result, - KEY_SENDUP_REGISTERED)) - goto msgfail; - msgfail: - key_freesav(d, KEY_SADB_LOCKED); + key_send_delete(d); } } /* choose latest if both types present */ - if (natt_candidate == NULL) + if (natt_candidate == NULL) { candidate = no_natt_candidate; - else if (no_natt_candidate == NULL) + } else if (no_natt_candidate == NULL) { candidate = natt_candidate; - else if (sah->saidx.mode == IPSEC_MODE_TUNNEL && dstport) + } else if (sah->saidx.mode == IPSEC_MODE_TUNNEL && dstport) { candidate = natt_candidate; - else if (natt_candidate->lft_c->sadb_lifetime_addtime > - no_natt_candidate->lft_c->sadb_lifetime_addtime) + } else if (natt_candidate->lft_c->sadb_lifetime_addtime > + no_natt_candidate->lft_c->sadb_lifetime_addtime) { candidate = natt_candidate; - else + } else { candidate = no_natt_candidate; + } if (candidate) { candidate->refcnt++; KEYDEBUG(KEYDEBUG_IPSEC_STAMP, - printf("DP allocsa_policy cause " - "refcnt++:%d SA:%p\n", - candidate->refcnt, candidate)); + printf("DP allocsa_policy cause " + "refcnt++:%d SA:0x%llx\n", candidate->refcnt, + (uint64_t)VM_KERNEL_ADDRPERM(candidate))); } return candidate; } @@ -1111,6 +1297,17 @@ key_allocsa( caddr_t dst, u_int proto, u_int32_t spi) +{ + return key_allocsa_extended(family, src, dst, proto, spi, NULL); +} + +struct secasvar * +key_allocsa_extended(u_int family, + caddr_t src, + caddr_t dst, + u_int proto, + u_int32_t spi, + ifnet_t interface) { struct secasvar *sav, *match; u_int stateidx, state, tmpidx, matchidx; @@ -1118,12 +1315,13 @@ key_allocsa( struct sockaddr_in6 sin6; const u_int *saorder_state_valid; int arraysize; - - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); + + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); /* sanity check */ - if (src == NULL || dst == NULL) + if (src == NULL || dst == NULL) { panic("key_allocsa: NULL pointer is passed.\n"); + } /* * when both systems employ similar strategy to use a SA. @@ -1151,13 +1349,20 @@ key_allocsa( matchidx = arraysize; lck_mtx_lock(sadb_mutex); LIST_FOREACH(sav, &spihash[SPIHASH(spi)], spihash) { - if (sav->spi != spi) + if (sav->spi != spi) { + continue; + } + if (interface != NULL && + sav->sah->ipsec_if != interface) { continue; - if (proto != sav->sah->saidx.proto) + } + if (proto != sav->sah->saidx.proto) { continue; + } if (family != sav->sah->saidx.src.ss_family || - family != sav->sah->saidx.dst.ss_family) + family != sav->sah->saidx.dst.ss_family) { continue; + } tmpidx = arraysize; for (stateidx = 0; stateidx < matchidx; stateidx++) { state = saorder_state_valid[stateidx]; @@ -1166,10 +1371,11 @@ key_allocsa( break; } } - if (tmpidx >= matchidx) + if (tmpidx >= matchidx) { continue; + } -#if 0 /* don't check src */ +#if 0 /* don't check src */ /* check src address */ switch (family) { case AF_INET: @@ -1179,24 +1385,26 @@ key_allocsa( bcopy(src, &sin.sin_addr, sizeof(sin.sin_addr)); if (key_sockaddrcmp((struct sockaddr*)&sin, - (struct sockaddr *)&sav->sah->saidx.src, 0) != 0) + (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) + 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: " @@ -1215,25 +1423,27 @@ key_allocsa( bcopy(dst, &sin.sin_addr, sizeof(sin.sin_addr)); if (key_sockaddrcmp((struct sockaddr*)&sin, - (struct sockaddr *)&sav->sah->saidx.dst, 0) != 0) + (struct sockaddr *)&sav->sah->saidx.dst, 0) != 0) { continue; + } break; case AF_INET6: - bzero(&sin6, sizeof(sin6)); - sin6.sin6_family = AF_INET6; - sin6.sin6_len = sizeof(sin6); - bcopy(dst, &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.dst, 0) != 0) + bzero(&sin6, sizeof(sin6)); + sin6.sin6_family = AF_INET6; + sin6.sin6_len = sizeof(sin6); + bcopy(dst, &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.dst, 0) != 0) { continue; + } break; default: ipseclog((LOG_DEBUG, "key_allocsa: " @@ -1244,8 +1454,9 @@ key_allocsa( match = sav; matchidx = tmpidx; } - if (match) + if (match) { goto found; + } /* not found */ lck_mtx_unlock(sadb_mutex); @@ -1255,59 +1466,211 @@ found: match->refcnt++; lck_mtx_unlock(sadb_mutex); KEYDEBUG(KEYDEBUG_IPSEC_STAMP, - printf("DP allocsa cause refcnt++:%d SA:%p\n", - match->refcnt, match)); + printf("DP allocsa cause refcnt++:%d SA:0x%llx\n", + match->refcnt, (uint64_t)VM_KERNEL_ADDRPERM(match))); return match; } -u_int16_t -key_natt_get_translated_port( - struct secasvar *outsav) +/* + * This function checks whether a UDP packet with a random local port + * and a remote port of 4500 matches an SA in the kernel. If does match, + * send the packet to the ESP engine. If not, send the packet to the UDP protocol. + */ +bool +key_checksa_present(u_int family, + caddr_t local_addr, + caddr_t remote_addr, + u_int16_t local_port, + u_int16_t remote_port) { + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); - struct secasindex saidx; - struct secashead *sah; - u_int stateidx, state; - const u_int *saorder_state_valid; - int arraysize; - - /* get sa for incoming */ - saidx.mode = outsav->sah->saidx.mode; - saidx.reqid = 0; - saidx.proto = outsav->sah->saidx.proto; - bcopy(&outsav->sah->saidx.src, &saidx.dst, sizeof(struct sockaddr_in)); - bcopy(&outsav->sah->saidx.dst, &saidx.src, sizeof(struct sockaddr_in)); - - lck_mtx_lock(sadb_mutex); - LIST_FOREACH(sah, &sahtree, chain) { - if (sah->state == SADB_SASTATE_DEAD) - continue; - if (key_cmpsaidx(&sah->saidx, &saidx, CMP_MODE)) - goto found; + /* sanity check */ + if (local_addr == NULL || remote_addr == NULL) { + panic("key_allocsa: NULL pointer is passed.\n"); } - lck_mtx_unlock(sadb_mutex); - return 0; -found: - /* - * Found sah - now go thru list of SAs and find - * matching remote ike port. If found - set - * sav->natt_encapsulated_src_port and return the port. + /* + * searching SAD. + * XXX: to be checked internal IP header somewhere. Also when + * IPsec tunnel packet is received. But ESP tunnel mode is + * encrypted so we can't check internal IP header. */ /* - * search a valid state list for outbound packet. - * This search order is important. + * search a valid state list for inbound packet. + * the search order is not important. */ - if (key_preferred_oldsa) { - saorder_state_valid = saorder_state_valid_prefer_old; - arraysize = _ARRAYLEN(saorder_state_valid_prefer_old); - } else { - saorder_state_valid = saorder_state_valid_prefer_new; - arraysize = _ARRAYLEN(saorder_state_valid_prefer_new); - } + struct secashead *sah = NULL; + bool found_sa = false; - for (stateidx = 0; stateidx < arraysize; stateidx++) { - state = saorder_state_valid[stateidx]; + lck_mtx_lock(sadb_mutex); + LIST_FOREACH(sah, &sahtree, chain) { + if (sah->state == SADB_SASTATE_DEAD) { + continue; + } + + if (sah->dir != IPSEC_DIR_OUTBOUND) { + continue; + } + + if (family != sah->saidx.src.ss_family) { + continue; + } + + struct sockaddr_in src_in = {}; + struct sockaddr_in6 src_in6 = {}; + + /* check src address */ + switch (family) { + case AF_INET: + src_in.sin_family = AF_INET; + src_in.sin_len = sizeof(src_in); + memcpy(&src_in.sin_addr, local_addr, sizeof(src_in.sin_addr)); + if (key_sockaddrcmp((struct sockaddr*)&src_in, + (struct sockaddr *)&sah->saidx.src, 0) != 0) { + continue; + } + break; + case AF_INET6: + src_in6.sin6_family = AF_INET6; + src_in6.sin6_len = sizeof(src_in6); + memcpy(&src_in6.sin6_addr, local_addr, sizeof(src_in6.sin6_addr)); + if (IN6_IS_SCOPE_LINKLOCAL(&src_in6.sin6_addr)) { + /* kame fake scopeid */ + src_in6.sin6_scope_id = + ntohs(src_in6.sin6_addr.s6_addr16[1]); + src_in6.sin6_addr.s6_addr16[1] = 0; + } + if (key_sockaddrcmp((struct sockaddr*)&src_in6, + (struct sockaddr *)&sah->saidx.src, 0) != 0) { + continue; + } + break; + default: + ipseclog((LOG_DEBUG, "key_checksa_present: " + "unknown address family=%d.\n", + family)); + continue; + } + + struct sockaddr_in dest_in = {}; + struct sockaddr_in6 dest_in6 = {}; + + /* check dst address */ + switch (family) { + case AF_INET: + dest_in.sin_family = AF_INET; + dest_in.sin_len = sizeof(dest_in); + memcpy(&dest_in.sin_addr, remote_addr, sizeof(dest_in.sin_addr)); + if (key_sockaddrcmp((struct sockaddr*)&dest_in, + (struct sockaddr *)&sah->saidx.dst, 0) != 0) { + continue; + } + + break; + case AF_INET6: + dest_in6.sin6_family = AF_INET6; + dest_in6.sin6_len = sizeof(dest_in6); + memcpy(&dest_in6.sin6_addr, remote_addr, sizeof(dest_in6.sin6_addr)); + if (IN6_IS_SCOPE_LINKLOCAL(&dest_in6.sin6_addr)) { + /* kame fake scopeid */ + dest_in6.sin6_scope_id = + ntohs(dest_in6.sin6_addr.s6_addr16[1]); + dest_in6.sin6_addr.s6_addr16[1] = 0; + } + if (key_sockaddrcmp((struct sockaddr*)&dest_in6, + (struct sockaddr *)&sah->saidx.dst, 0) != 0) { + continue; + } + + break; + default: + ipseclog((LOG_DEBUG, "key_checksa_present: " + "unknown address family=%d.\n", family)); + continue; + } + + struct secasvar *nextsav = NULL; + for (u_int stateidx = 0; stateidx < _ARRAYLEN(saorder_state_alive); stateidx++) { + u_int state = saorder_state_alive[stateidx]; + for (struct secasvar *sav = LIST_FIRST(&sah->savtree[state]); sav != NULL; sav = nextsav) { + nextsav = LIST_NEXT(sav, chain); + /* sanity check */ + if (sav->state != state) { + ipseclog((LOG_DEBUG, "key_checksa_present: " + "invalid sav->state " + "(state: %d SA: %d)\n", + state, sav->state)); + continue; + } + + if (sav->remote_ike_port != ntohs(remote_port)) { + continue; + } + + if (sav->natt_encapsulated_src_port != local_port) { + continue; + } + found_sa = true;; + break; + } + } + } + + /* not found */ + lck_mtx_unlock(sadb_mutex); + return found_sa; +} + +u_int16_t +key_natt_get_translated_port( + struct secasvar *outsav) +{ + struct secasindex saidx; + struct secashead *sah; + u_int stateidx, state; + const u_int *saorder_state_valid; + int arraysize; + + /* get sa for incoming */ + saidx.mode = outsav->sah->saidx.mode; + saidx.reqid = 0; + saidx.proto = outsav->sah->saidx.proto; + bcopy(&outsav->sah->saidx.src, &saidx.dst, sizeof(struct sockaddr_in)); + bcopy(&outsav->sah->saidx.dst, &saidx.src, sizeof(struct sockaddr_in)); + + lck_mtx_lock(sadb_mutex); + LIST_FOREACH(sah, &sahtree, chain) { + if (sah->state == SADB_SASTATE_DEAD) { + continue; + } + if (key_cmpsaidx(&sah->saidx, &saidx, CMP_MODE)) { + goto found; + } + } + lck_mtx_unlock(sadb_mutex); + return 0; + +found: + /* + * Found sah - now go thru list of SAs and find + * matching remote ike port. If found - set + * sav->natt_encapsulated_src_port and return the port. + */ + /* + * search a valid state list for outbound packet. + * This search order is important. + */ + if (key_preferred_oldsa) { + saorder_state_valid = saorder_state_valid_prefer_old; + arraysize = _ARRAYLEN(saorder_state_valid_prefer_old); + } else { + saorder_state_valid = saorder_state_valid_prefer_new; + arraysize = _ARRAYLEN(saorder_state_valid_prefer_new); + } + + for (stateidx = 0; stateidx < arraysize; stateidx++) { + state = saorder_state_valid[stateidx]; if (key_do_get_translated_port(sah, outsav, state)) { lck_mtx_unlock(sadb_mutex); return outsav->natt_encapsulated_src_port; @@ -1326,40 +1689,41 @@ key_do_get_translated_port( struct secasvar *currsav, *nextsav, *candidate; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED); - + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); + /* initilize */ candidate = NULL; for (currsav = LIST_FIRST(&sah->savtree[state]); - currsav != NULL; - currsav = nextsav) { - + currsav != NULL; + currsav = nextsav) { nextsav = LIST_NEXT(currsav, chain); /* sanity check */ KEY_CHKSASTATE(currsav->state, state, "key_do_get_translated_port"); - + if ((currsav->flags & SADB_X_EXT_NATT_MULTIPLEUSERS) == 0 || - currsav->remote_ike_port != outsav->remote_ike_port) + currsav->remote_ike_port != outsav->remote_ike_port) { continue; + } if (candidate == NULL) { candidate = currsav; continue; } - + /* Which SA is the better ? */ /* sanity check 2 */ - if (candidate->lft_c == NULL || currsav->lft_c == NULL) + if (candidate->lft_c == NULL || currsav->lft_c == NULL) { panic("key_do_get_translated_port: " - "lifetime_current is NULL.\n"); + "lifetime_current is NULL.\n"); + } /* What the best method is to compare ? */ if (key_preferred_oldsa) { if (candidate->lft_c->sadb_lifetime_addtime > - currsav->lft_c->sadb_lifetime_addtime) { + currsav->lft_c->sadb_lifetime_addtime) { candidate = currsav; } continue; @@ -1368,11 +1732,12 @@ key_do_get_translated_port( /* prefered new sa rather than old sa */ if (candidate->lft_c->sadb_lifetime_addtime < - currsav->lft_c->sadb_lifetime_addtime) + currsav->lft_c->sadb_lifetime_addtime) { candidate = currsav; + } } - if (candidate) { + if (candidate) { outsav->natt_encapsulated_src_port = candidate->natt_encapsulated_src_port; return 1; } @@ -1382,129 +1747,36 @@ key_do_get_translated_port( /* * Must be called after calling key_allocsp(). - * For both the packet without socket and key_freeso(). */ void key_freesp( struct secpolicy *sp, int locked) { - /* sanity check */ - if (sp == NULL) + if (sp == NULL) { panic("key_freesp: NULL pointer is passed.\n"); - - if (!locked) + } + + if (!locked) { lck_mtx_lock(sadb_mutex); - else - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED); + } else { + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); + } sp->refcnt--; KEYDEBUG(KEYDEBUG_IPSEC_STAMP, - printf("DP freesp cause refcnt--:%d SP:%p\n", - sp->refcnt, sp)); + printf("DP freesp cause refcnt--:%d SP:0x%llx\n", + sp->refcnt, (uint64_t)VM_KERNEL_ADDRPERM(sp))); - if (sp->refcnt == 0) + if (sp->refcnt == 0) { key_delsp(sp); - if (!locked) - lck_mtx_unlock(sadb_mutex); - return; -} - -#if 0 -static void key_freesp_so(struct secpolicy **); - -/* - * Must be called after calling key_allocsp(). - * For the packet with socket. - */ -void -key_freeso( - struct socket *so) -{ - - /* sanity check */ - if (so == NULL) - panic("key_freeso: NULL pointer is passed.\n"); - - lck_mtx_lock(sadb_mutex); - switch (so->so_proto->pr_domain->dom_family) { -#if INET - case PF_INET: - { - struct inpcb *pcb = sotoinpcb(so); - - /* Does it have a PCB ? */ - if (pcb == NULL || pcb->inp_sp == NULL) - goto done; - key_freesp_so(&pcb->inp_sp->sp_in); - key_freesp_so(&pcb->inp_sp->sp_out); - } - break; -#endif -#if INET6 - case PF_INET6: - { -#if HAVE_NRL_INPCB - struct inpcb *pcb = sotoinpcb(so); - - /* Does it have a PCB ? */ - if (pcb == NULL || pcb->inp_sp == NULL) - goto done; - key_freesp_so(&pcb->inp_sp->sp_in); - key_freesp_so(&pcb->inp_sp->sp_out); -#else - struct in6pcb *pcb = sotoin6pcb(so); - - /* Does it have a PCB ? */ - if (pcb == NULL || pcb->in6p_sp == NULL) - goto done; - key_freesp_so(&pcb->in6p_sp->sp_in); - key_freesp_so(&pcb->in6p_sp->sp_out); -#endif - } - break; -#endif /* INET6 */ - default: - ipseclog((LOG_DEBUG, "key_freeso: unknown address family=%d.\n", - so->so_proto->pr_domain->dom_family)); - break; } -done: - lck_mtx_unlock(sadb_mutex); - - return; -} - -static void -key_freesp_so( - struct secpolicy **sp) -{ - - /* sanity check */ - if (sp == NULL || *sp == NULL) - panic("key_freesp_so: sp == NULL\n"); - - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED); - - switch ((*sp)->policy) { - case IPSEC_POLICY_IPSEC: - KEYDEBUG(KEYDEBUG_IPSEC_STAMP, - printf("DP freeso calls free SP:%p\n", *sp)); - key_freesp(*sp, KEY_SADB_LOCKED); - *sp = NULL; - break; - case IPSEC_POLICY_ENTRUST: - case IPSEC_POLICY_BYPASS: - return; - default: - panic("key_freesp_so: Invalid policy found %d", (*sp)->policy); + if (!locked) { + lck_mtx_unlock(sadb_mutex); } - return; } -#endif - /* * Must be called after calling key_allocsa(). * This function is called by key_freesp() to free some SA allocated @@ -1515,24 +1787,28 @@ key_freesav( struct secasvar *sav, int locked) { - /* sanity check */ - if (sav == NULL) + if (sav == NULL) { panic("key_freesav: NULL pointer is passed.\n"); + } - if (!locked) + if (!locked) { lck_mtx_lock(sadb_mutex); - else - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED); + } else { + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); + } sav->refcnt--; KEYDEBUG(KEYDEBUG_IPSEC_STAMP, - printf("DP freesav cause refcnt--:%d SA:%p SPI %u\n", - sav->refcnt, sav, (u_int32_t)ntohl(sav->spi))); + printf("DP freesav cause refcnt--:%d SA:0x%llx SPI %u\n", + sav->refcnt, (uint64_t)VM_KERNEL_ADDRPERM(sav), + (u_int32_t)ntohl(sav->spi))); - if (sav->refcnt == 0) + if (sav->refcnt == 0) { key_delsav(sav); - if (!locked) + } + if (!locked) { lck_mtx_unlock(sadb_mutex); + } return; } @@ -1544,31 +1820,46 @@ static void key_delsp( struct secpolicy *sp) { - /* sanity check */ - if (sp == NULL) + if (sp == NULL) { panic("key_delsp: NULL pointer is passed.\n"); - - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED); + } + + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); sp->state = IPSEC_SPSTATE_DEAD; - if (sp->refcnt > 0) + if (sp->refcnt > 0) { return; /* can't free */ - + } /* remove from SP index */ if (__LIST_CHAINED(sp)) { LIST_REMOVE(sp, chain); ipsec_policy_count--; } - { + if (sp->spidx.internal_if) { + ifnet_release(sp->spidx.internal_if); + sp->spidx.internal_if = NULL; + } + + if (sp->ipsec_if) { + ifnet_release(sp->ipsec_if); + sp->ipsec_if = NULL; + } + + if (sp->outgoing_if) { + ifnet_release(sp->outgoing_if); + sp->outgoing_if = NULL; + } + + { struct ipsecrequest *isr = sp->req, *nextisr; while (isr != NULL) { nextisr = isr->next; KFREE(isr); isr = nextisr; - } + } } keydb_delsecpolicy(sp); @@ -1586,15 +1877,17 @@ key_getsp( { struct secpolicy *sp; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED); + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); /* sanity check */ - if (spidx == NULL) + if (spidx == NULL) { panic("key_getsp: NULL pointer is passed.\n"); + } LIST_FOREACH(sp, &sptree[spidx->dir], chain) { - if (sp->state == IPSEC_SPSTATE_DEAD) + if (sp->state == IPSEC_SPSTATE_DEAD) { continue; + } if (key_cmpspidx_exactly(spidx, &sp->spidx)) { sp->refcnt++; return sp; @@ -1609,17 +1902,32 @@ key_getsp( * OUT: NULL : not found * others : found, pointer to a SP. */ -static struct secpolicy * +struct secpolicy * key_getspbyid( u_int32_t id) { struct secpolicy *sp; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED); + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); + + lck_mtx_lock(sadb_mutex); + sp = __key_getspbyid(id); + lck_mtx_unlock(sadb_mutex); + + return sp; +} + +static struct secpolicy * +__key_getspbyid(u_int32_t id) +{ + struct secpolicy *sp; + + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); LIST_FOREACH(sp, &sptree[IPSEC_DIR_INBOUND], chain) { - if (sp->state == IPSEC_SPSTATE_DEAD) + if (sp->state == IPSEC_SPSTATE_DEAD) { continue; + } if (sp->id == id) { sp->refcnt++; return sp; @@ -1627,8 +1935,9 @@ key_getspbyid( } LIST_FOREACH(sp, &sptree[IPSEC_DIR_OUTBOUND], chain) { - if (sp->state == IPSEC_SPSTATE_DEAD) + if (sp->state == IPSEC_SPSTATE_DEAD) { continue; + } if (sp->id == id) { sp->refcnt++; return sp; @@ -1642,11 +1951,12 @@ struct secpolicy * key_newsp(void) { struct secpolicy *newsp = NULL; - - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); + + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); newsp = keydb_newsecpolicy(); - if (!newsp) + if (!newsp) { return newsp; + } newsp->refcnt = 1; newsp->req = NULL; @@ -1667,13 +1977,15 @@ key_msg2sp( { struct secpolicy *newsp; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); - + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); + /* sanity check */ - if (xpl0 == NULL) + if (xpl0 == NULL) { panic("key_msg2sp: NULL pointer was passed.\n"); - if (len < sizeof(*xpl0)) + } + if (len < sizeof(*xpl0)) { panic("key_msg2sp: invalid length.\n"); + } if (len != PFKEY_EXTLEN(xpl0)) { ipseclog((LOG_DEBUG, "key_msg2sp: Invalid msg length.\n")); *error = EINVAL; @@ -1691,7 +2003,7 @@ key_msg2sp( /* check policy */ switch (xpl0->sadb_x_policy_type) { case IPSEC_POLICY_DISCARD: - case IPSEC_POLICY_GENERATE: + case IPSEC_POLICY_GENERATE: case IPSEC_POLICY_NONE: case IPSEC_POLICY_ENTRUST: case IPSEC_POLICY_BYPASS: @@ -1699,7 +2011,7 @@ key_msg2sp( break; case IPSEC_POLICY_IPSEC: - { + { int tlen; struct sadb_x_ipsecrequest *xisr; struct ipsecrequest **p_isr = &newsp->req; @@ -1717,11 +2029,18 @@ key_msg2sp( xisr = (struct sadb_x_ipsecrequest *)(xpl0 + 1); while (tlen > 0) { + if (tlen < sizeof(*xisr)) { + ipseclog((LOG_DEBUG, "key_msg2sp: " + "invalid ipsecrequest.\n")); + key_freesp(newsp, KEY_SADB_UNLOCKED); + *error = EINVAL; + return NULL; + } /* length check */ if (xisr->sadb_x_ipsecrequest_len < sizeof(*xisr)) { ipseclog((LOG_DEBUG, "key_msg2sp: " - "invalid ipsecrequest length.\n")); + "invalid ipsecrequest length.\n")); key_freesp(newsp, KEY_SADB_UNLOCKED); *error = EINVAL; return NULL; @@ -1744,7 +2063,6 @@ key_msg2sp( switch (xisr->sadb_x_ipsecrequest_proto) { case IPPROTO_ESP: case IPPROTO_AH: - case IPPROTO_IPCOMP: break; default: ipseclog((LOG_DEBUG, @@ -1783,7 +2101,7 @@ key_msg2sp( * update it, don't refuse it. */ if (xisr->sadb_x_ipsecrequest_reqid - > IPSEC_MANUAL_REQID_MAX) { + > IPSEC_MANUAL_REQID_MAX) { ipseclog((LOG_DEBUG, "key_msg2sp: reqid=%d range " "violation, updated by kernel.\n", @@ -1802,15 +2120,15 @@ key_msg2sp( (*p_isr)->saidx.reqid = reqid; xisr->sadb_x_ipsecrequest_reqid = reqid; } else { - /* set it for manual keying. */ + /* set it for manual keying. */ (*p_isr)->saidx.reqid = - xisr->sadb_x_ipsecrequest_reqid; + xisr->sadb_x_ipsecrequest_reqid; } break; default: ipseclog((LOG_DEBUG, "key_msg2sp: invalid level=%u\n", - xisr->sadb_x_ipsecrequest_level)); + xisr->sadb_x_ipsecrequest_level)); key_freesp(newsp, KEY_SADB_UNLOCKED); *error = EINVAL; return NULL; @@ -1821,34 +2139,62 @@ key_msg2sp( if (xisr->sadb_x_ipsecrequest_len > sizeof(*xisr)) { struct sockaddr *paddr; + if (tlen < xisr->sadb_x_ipsecrequest_len) { + ipseclog((LOG_DEBUG, "key_msg2sp: invalid request " + "address length.\n")); + key_freesp(newsp, KEY_SADB_UNLOCKED); + *error = EINVAL; + return NULL; + } + paddr = (struct sockaddr *)(xisr + 1); + uint8_t src_len = paddr->sa_len; + + /* +sizeof(uint8_t) for dst_len below */ + if (xisr->sadb_x_ipsecrequest_len < sizeof(*xisr) + src_len + sizeof(uint8_t)) { + ipseclog((LOG_DEBUG, "key_msg2sp: invalid request " + "invalid source address length.\n")); + key_freesp(newsp, KEY_SADB_UNLOCKED); + *error = EINVAL; + return NULL; + } /* validity check */ if (paddr->sa_len > sizeof((*p_isr)->saidx.src)) { ipseclog((LOG_DEBUG, "key_msg2sp: invalid request " - "address length.\n")); + "address length.\n")); key_freesp(newsp, KEY_SADB_UNLOCKED); *error = EINVAL; return NULL; } + bcopy(paddr, &(*p_isr)->saidx.src, - paddr->sa_len); + MIN(paddr->sa_len, sizeof((*p_isr)->saidx.src))); - paddr = (struct sockaddr *)((caddr_t)paddr - + paddr->sa_len); + paddr = (struct sockaddr *)((caddr_t)paddr + paddr->sa_len); + uint8_t dst_len = paddr->sa_len; + + if (xisr->sadb_x_ipsecrequest_len < sizeof(*xisr) + src_len + dst_len) { + ipseclog((LOG_DEBUG, "key_msg2sp: invalid request " + "invalid dest address length.\n")); + key_freesp(newsp, KEY_SADB_UNLOCKED); + *error = EINVAL; + return NULL; + } /* validity check */ if (paddr->sa_len > sizeof((*p_isr)->saidx.dst)) { ipseclog((LOG_DEBUG, "key_msg2sp: invalid request " - "address length.\n")); + "address length.\n")); key_freesp(newsp, KEY_SADB_UNLOCKED); *error = EINVAL; return NULL; } + bcopy(paddr, &(*p_isr)->saidx.dst, - paddr->sa_len); + MIN(paddr->sa_len, sizeof((*p_isr)->saidx.dst))); } (*p_isr)->sp = newsp; @@ -1868,8 +2214,8 @@ key_msg2sp( xisr = (struct sadb_x_ipsecrequest *)(void *) ((caddr_t)xisr + xisr->sadb_x_ipsecrequest_len); } - } - break; + } + break; default: ipseclog((LOG_DEBUG, "key_msg2sp: invalid policy type.\n")); key_freesp(newsp, KEY_SADB_UNLOCKED); @@ -1889,17 +2235,17 @@ key_newreqid(void) int done = 0; /* The reqid must be limited to 16 bits because the PF_KEY message format only uses - 16 bits for this field. Once it becomes larger than 16 bits - ipsec fails to - work anymore. Changing the PF_KEY message format would introduce compatibility - issues. This code now tests to see if the tentative reqid is in use */ + * 16 bits for this field. Once it becomes larger than 16 bits - ipsec fails to + * work anymore. Changing the PF_KEY message format would introduce compatibility + * issues. This code now tests to see if the tentative reqid is in use */ while (!done) { struct secpolicy *sp; - struct ipsecrequest *isr; + struct ipsecrequest *isr; int dir; auto_reqid = (auto_reqid == 0xFFFF - ? IPSEC_MANUAL_REQID_MAX + 1 : auto_reqid + 1); + ? IPSEC_MANUAL_REQID_MAX + 1 : auto_reqid + 1); /* check for uniqueness */ done = 1; @@ -1911,12 +2257,14 @@ key_newreqid(void) break; } } - if (done == 0) + if (done == 0) { break; + } } - if (done == 0) + if (done == 0) { break; - } + } + } } lck_mtx_unlock(sadb_mutex); @@ -1936,15 +2284,17 @@ key_sp2msg( struct mbuf *m; /* sanity check. */ - if (sp == NULL) + if (sp == NULL) { panic("key_sp2msg: NULL pointer was passed.\n"); + } tlen = key_getspreqmsglen(sp); m = key_alloc_mbuf(tlen); - if (!m || m->m_next) { /*XXX*/ - if (m) + if (!m || m->m_next) { /*XXX*/ + if (m) { m_freem(m); + } return NULL; } @@ -1966,7 +2316,6 @@ key_sp2msg( struct ipsecrequest *isr; for (isr = sp->req; isr != NULL; isr = isr->next) { - xisr = (struct sadb_x_ipsecrequest *)(void *)p; xisr->sadb_x_ipsecrequest_proto = isr->saidx.proto; @@ -1981,9 +2330,9 @@ key_sp2msg( p += isr->saidx.src.ss_len; xisr->sadb_x_ipsecrequest_len = - PFKEY_ALIGN8(sizeof(*xisr) - + isr->saidx.src.ss_len - + isr->saidx.dst.ss_len); + PFKEY_ALIGN8(sizeof(*xisr) + + isr->saidx.src.ss_len + + isr->saidx.dst.ss_len); } } @@ -1993,36 +2342,37 @@ key_sp2msg( /* m will not be freed nor modified */ static struct mbuf * key_gather_mbuf(struct mbuf *m, const struct sadb_msghdr *mhp, - int ndeep, int nitem, int *items) + int ndeep, int nitem, int *items) { int idx; int i; struct mbuf *result = NULL, *n; int len; - if (m == NULL || mhp == NULL) + if (m == NULL || mhp == NULL) { panic("null pointer passed to key_gather"); + } for (i = 0; i < nitem; i++) { idx = items[i]; - if (idx < 0 || idx > SADB_EXT_MAX) + if (idx < 0 || idx > SADB_EXT_MAX) { goto fail; + } /* don't attempt to pull empty extension */ - if (idx == SADB_EXT_RESERVED && mhp->msg == NULL) + if (idx == SADB_EXT_RESERVED && mhp->msg == NULL) { continue; - if (idx != SADB_EXT_RESERVED && - (mhp->ext[idx] == NULL || mhp->extlen[idx] == 0)) + } + if (idx != SADB_EXT_RESERVED && + (mhp->ext[idx] == NULL || mhp->extlen[idx] == 0)) { continue; + } if (idx == SADB_EXT_RESERVED) { len = PFKEY_ALIGN8(sizeof(struct sadb_msg)); -#if DIAGNOSTIC - if (len > MHLEN) - panic("assumption failed"); -#endif - MGETHDR(n, M_WAITOK, MT_DATA); - if (!n) + MGETHDR(n, M_WAITOK, MT_DATA); // sadb_msg len < MHLEN - enforced by _CASSERT + if (!n) { goto fail; + } n->m_len = len; n->m_next = NULL; m_copydata(m, 0, sizeof(struct sadb_msg), @@ -2030,9 +2380,10 @@ key_gather_mbuf(struct mbuf *m, const struct sadb_msghdr *mhp, } else if (i < ndeep) { len = mhp->extlen[idx]; n = key_alloc_mbuf(len); - if (!n || n->m_next) { /*XXX*/ - if (n) + if (!n || n->m_next) { /*XXX*/ + if (n) { m_freem(n); + } goto fail; } m_copydata(m, mhp->extoff[idx], mhp->extlen[idx], @@ -2041,19 +2392,22 @@ key_gather_mbuf(struct mbuf *m, const struct sadb_msghdr *mhp, n = m_copym(m, mhp->extoff[idx], mhp->extlen[idx], M_WAITOK); } - if (n == NULL) + if (n == NULL) { goto fail; + } - if (result) + if (result) { m_cat(result, n); - else + } else { result = n; + } } if ((result->m_flags & M_PKTHDR) != 0) { result->m_pkthdr.len = 0; - for (n = result; n; n = n->m_next) + for (n = result; n; n = n->m_next) { result->m_pkthdr.len += n->m_len; + } } return result; @@ -2085,57 +2439,104 @@ key_spdadd( struct mbuf *m, const struct sadb_msghdr *mhp) { - struct sadb_address *src0, *dst0; + struct sadb_address *src0, *dst0, *src1 = NULL, *dst1 = NULL; struct sadb_x_policy *xpl0, *xpl; struct sadb_lifetime *lft = NULL; struct secpolicyindex spidx; struct secpolicy *newsp; struct timeval tv; + ifnet_t internal_if = NULL; + char *outgoing_if = NULL; + char *ipsec_if = NULL; + struct sadb_x_ipsecif *ipsecifopts = NULL; int error; + int use_src_range = 0; + int use_dst_range = 0; + int init_disabled = 0; + int address_family, address_len; + + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); - /* sanity check */ - if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) + if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) { panic("key_spdadd: NULL pointer is passed.\n"); + } - if (mhp->ext[SADB_EXT_ADDRESS_SRC] == NULL || - mhp->ext[SADB_EXT_ADDRESS_DST] == NULL || + if (mhp->ext[SADB_X_EXT_ADDR_RANGE_SRC_START] != NULL && mhp->ext[SADB_X_EXT_ADDR_RANGE_SRC_END] != NULL) { + use_src_range = 1; + } + if (mhp->ext[SADB_X_EXT_ADDR_RANGE_DST_START] != NULL && mhp->ext[SADB_X_EXT_ADDR_RANGE_DST_END] != NULL) { + use_dst_range = 1; + } + + if ((!use_src_range && mhp->ext[SADB_EXT_ADDRESS_SRC] == NULL) || + (!use_dst_range && mhp->ext[SADB_EXT_ADDRESS_DST] == NULL) || mhp->ext[SADB_X_EXT_POLICY] == NULL) { ipseclog((LOG_DEBUG, "key_spdadd: invalid message is passed.\n")); return key_senderror(so, m, EINVAL); } - if (mhp->extlen[SADB_EXT_ADDRESS_SRC] < sizeof(struct sadb_address) || - mhp->extlen[SADB_EXT_ADDRESS_DST] < sizeof(struct sadb_address) || + if ((use_src_range && (mhp->extlen[SADB_X_EXT_ADDR_RANGE_SRC_START] < sizeof(struct sadb_address) + || mhp->extlen[SADB_X_EXT_ADDR_RANGE_SRC_END] < sizeof(struct sadb_address))) || + (!use_src_range && mhp->extlen[SADB_EXT_ADDRESS_SRC] < sizeof(struct sadb_address)) || + (use_dst_range && (mhp->extlen[SADB_X_EXT_ADDR_RANGE_DST_START] < sizeof(struct sadb_address) + || mhp->extlen[SADB_X_EXT_ADDR_RANGE_DST_END] < sizeof(struct sadb_address))) || + (!use_dst_range && mhp->extlen[SADB_EXT_ADDRESS_DST] < sizeof(struct sadb_address)) || mhp->extlen[SADB_X_EXT_POLICY] < sizeof(struct sadb_x_policy)) { ipseclog((LOG_DEBUG, "key_spdadd: invalid message is passed.\n")); return key_senderror(so, m, EINVAL); } if (mhp->ext[SADB_EXT_LIFETIME_HARD] != NULL) { if (mhp->extlen[SADB_EXT_LIFETIME_HARD] - < sizeof(struct sadb_lifetime)) { + < sizeof(struct sadb_lifetime)) { ipseclog((LOG_DEBUG, "key_spdadd: invalid message is passed.\n")); return key_senderror(so, m, EINVAL); } lft = (struct sadb_lifetime *) (void *)mhp->ext[SADB_EXT_LIFETIME_HARD]; } + if (mhp->ext[SADB_X_EXT_IPSECIF] != NULL) { + if (mhp->extlen[SADB_X_EXT_IPSECIF] < sizeof(struct sadb_x_ipsecif)) { + ipseclog((LOG_DEBUG, "key_spdadd: invalid message is passed.\n")); + return key_senderror(so, m, EINVAL); + } + } - src0 = (struct sadb_address *)mhp->ext[SADB_EXT_ADDRESS_SRC]; - dst0 = (struct sadb_address *)mhp->ext[SADB_EXT_ADDRESS_DST]; + if (use_src_range) { + src0 = (struct sadb_address *)mhp->ext[SADB_X_EXT_ADDR_RANGE_SRC_START]; + src1 = (struct sadb_address *)mhp->ext[SADB_X_EXT_ADDR_RANGE_SRC_END]; + } else { + src0 = (struct sadb_address *)mhp->ext[SADB_EXT_ADDRESS_SRC]; + } + if (use_dst_range) { + dst0 = (struct sadb_address *)mhp->ext[SADB_X_EXT_ADDR_RANGE_DST_START]; + dst1 = (struct sadb_address *)mhp->ext[SADB_X_EXT_ADDR_RANGE_DST_END]; + } else { + dst0 = (struct sadb_address *)mhp->ext[SADB_EXT_ADDRESS_DST]; + } xpl0 = (struct sadb_x_policy *)(void *)mhp->ext[SADB_X_EXT_POLICY]; + ipsecifopts = (struct sadb_x_ipsecif *)(void *)mhp->ext[SADB_X_EXT_IPSECIF]; + + /* check addresses */ + address_family = ((struct sockaddr *)(src0 + 1))->sa_family; + address_len = ((struct sockaddr *)(src0 + 1))->sa_len; + if (use_src_range) { + if (((struct sockaddr *)(src1 + 1))->sa_family != address_family || + ((struct sockaddr *)(src1 + 1))->sa_len != address_len) { + return key_senderror(so, m, EINVAL); + } + } + if (((struct sockaddr *)(dst0 + 1))->sa_family != address_family || + ((struct sockaddr *)(dst0 + 1))->sa_len != address_len) { + return key_senderror(so, m, EINVAL); + } + if (use_dst_range) { + if (((struct sockaddr *)(dst1 + 1))->sa_family != address_family || + ((struct sockaddr *)(dst1 + 1))->sa_len != address_len) { + return key_senderror(so, m, EINVAL); + } + } - /* make secindex */ - /* XXX boundary check against sa_len */ - KEY_SETSECSPIDX(xpl0->sadb_x_policy_dir, - src0 + 1, - dst0 + 1, - src0->sadb_address_prefixlen, - dst0->sadb_address_prefixlen, - src0->sadb_address_proto, - &spidx); - - /* checking the direciton. */ + /* checking the direction. */ switch (xpl0->sadb_x_policy_dir) { case IPSEC_DIR_INBOUND: case IPSEC_DIR_OUTBOUND: @@ -2149,19 +2550,48 @@ key_spdadd( /* check policy */ /* key_spdadd() accepts DISCARD, NONE and IPSEC. */ if (xpl0->sadb_x_policy_type == IPSEC_POLICY_ENTRUST - || xpl0->sadb_x_policy_type == IPSEC_POLICY_BYPASS) { + || xpl0->sadb_x_policy_type == IPSEC_POLICY_BYPASS) { ipseclog((LOG_DEBUG, "key_spdadd: Invalid policy type.\n")); return key_senderror(so, m, EINVAL); } /* policy requests are mandatory when action is ipsec. */ - if (mhp->msg->sadb_msg_type != SADB_X_SPDSETIDX - && xpl0->sadb_x_policy_type == IPSEC_POLICY_IPSEC - && mhp->extlen[SADB_X_EXT_POLICY] <= sizeof(*xpl0)) { + if (mhp->msg->sadb_msg_type != SADB_X_SPDSETIDX + && xpl0->sadb_x_policy_type == IPSEC_POLICY_IPSEC + && mhp->extlen[SADB_X_EXT_POLICY] <= sizeof(*xpl0)) { ipseclog((LOG_DEBUG, "key_spdadd: some policy requests part required.\n")); return key_senderror(so, m, EINVAL); } + /* Process interfaces */ + if (ipsecifopts != NULL) { + if (ipsecifopts->sadb_x_ipsecif_internal_if[0]) { + ifnet_find_by_name(ipsecifopts->sadb_x_ipsecif_internal_if, &internal_if); + } + if (ipsecifopts->sadb_x_ipsecif_outgoing_if[0]) { + outgoing_if = ipsecifopts->sadb_x_ipsecif_outgoing_if; + } + if (ipsecifopts->sadb_x_ipsecif_ipsec_if[0]) { + ipsec_if = ipsecifopts->sadb_x_ipsecif_ipsec_if; + } + init_disabled = ipsecifopts->sadb_x_ipsecif_init_disabled; + } + + /* make secindex */ + /* XXX boundary check against sa_len */ + KEY_SETSECSPIDX(xpl0->sadb_x_policy_dir, + src0 + 1, + dst0 + 1, + src0->sadb_address_prefixlen, + dst0->sadb_address_prefixlen, + src0->sadb_address_proto, + internal_if, + use_src_range ? src0 + 1 : NULL, + use_src_range ? src1 + 1 : NULL, + use_dst_range ? dst0 + 1 : NULL, + use_dst_range ? dst1 + 1 : NULL, + &spidx); + /* * checking there is SP already or not. * SPDUPDATE doesn't depend on whether there is a SP or not. @@ -2180,52 +2610,62 @@ key_spdadd( key_freesp(newsp, KEY_SADB_LOCKED); ipseclog((LOG_DEBUG, "key_spdadd: a SP entry exists already.\n")); lck_mtx_unlock(sadb_mutex); + if (internal_if) { + ifnet_release(internal_if); + internal_if = NULL; + } return key_senderror(so, m, EEXIST); } } lck_mtx_unlock(sadb_mutex); + /* allocation new SP entry */ if ((newsp = key_msg2sp(xpl0, PFKEY_EXTLEN(xpl0), &error)) == NULL) { + if (internal_if) { + ifnet_release(internal_if); + internal_if = NULL; + } return key_senderror(so, m, error); } if ((newsp->id = key_getnewspid()) == 0) { keydb_delsecpolicy(newsp); + if (internal_if) { + ifnet_release(internal_if); + internal_if = NULL; + } return key_senderror(so, m, ENOBUFS); } /* XXX boundary check against sa_len */ KEY_SETSECSPIDX(xpl0->sadb_x_policy_dir, - src0 + 1, - dst0 + 1, - src0->sadb_address_prefixlen, - dst0->sadb_address_prefixlen, - src0->sadb_address_proto, - &newsp->spidx); - - /* sanity check on addr pair */ - if (((struct sockaddr *)(src0 + 1))->sa_family != - ((struct sockaddr *)(dst0+ 1))->sa_family) { - keydb_delsecpolicy(newsp); - return key_senderror(so, m, EINVAL); - } - if (((struct sockaddr *)(src0 + 1))->sa_len != - ((struct sockaddr *)(dst0+ 1))->sa_len) { - keydb_delsecpolicy(newsp); - return key_senderror(so, m, EINVAL); - } + src0 + 1, + dst0 + 1, + src0->sadb_address_prefixlen, + dst0->sadb_address_prefixlen, + src0->sadb_address_proto, + internal_if, + use_src_range ? src0 + 1 : NULL, + use_src_range ? src1 + 1 : NULL, + use_dst_range ? dst0 + 1 : NULL, + use_dst_range ? dst1 + 1 : NULL, + &newsp->spidx); + #if 1 - /* - * allow IPv6 over IPv4 tunnels using ESP - - * otherwise reject if inner and outer address families not equal + /* + * allow IPv6 over IPv4 or IPv4 over IPv6 tunnels using ESP - + * otherwise reject if inner and outer address families not equal */ if (newsp->req && newsp->req->saidx.src.ss_family) { struct sockaddr *sa; sa = (struct sockaddr *)(src0 + 1); if (sa->sa_family != newsp->req->saidx.src.ss_family) { - if (newsp->req->saidx.mode != IPSEC_MODE_TUNNEL || newsp->req->saidx.proto != IPPROTO_ESP - || sa->sa_family != AF_INET6 || newsp->req->saidx.src.ss_family != AF_INET) { + if (newsp->req->saidx.mode != IPSEC_MODE_TUNNEL || newsp->req->saidx.proto != IPPROTO_ESP) { keydb_delsecpolicy(newsp); + if (internal_if) { + ifnet_release(internal_if); + internal_if = NULL; + } return key_senderror(so, m, EINVAL); } } @@ -2234,9 +2674,12 @@ key_spdadd( struct sockaddr *sa; sa = (struct sockaddr *)(dst0 + 1); if (sa->sa_family != newsp->req->saidx.dst.ss_family) { - if (newsp->req->saidx.mode != IPSEC_MODE_TUNNEL || newsp->req->saidx.proto != IPPROTO_ESP - || sa->sa_family != AF_INET6 || newsp->req->saidx.dst.ss_family != AF_INET) { + if (newsp->req->saidx.mode != IPSEC_MODE_TUNNEL || newsp->req->saidx.proto != IPPROTO_ESP) { keydb_delsecpolicy(newsp); + if (internal_if) { + ifnet_release(internal_if); + internal_if = NULL; + } return key_senderror(so, m, EINVAL); } } @@ -2249,31 +2692,46 @@ key_spdadd( newsp->lifetime = lft ? lft->sadb_lifetime_addtime : 0; newsp->validtime = lft ? lft->sadb_lifetime_usetime : 0; - newsp->refcnt = 1; /* do not reclaim until I say I do */ + if (outgoing_if != NULL) { + ifnet_find_by_name(outgoing_if, &newsp->outgoing_if); + } + if (ipsec_if != NULL) { + ifnet_find_by_name(ipsec_if, &newsp->ipsec_if); + } + if (init_disabled > 0) { + newsp->disabled = 1; + } + + newsp->refcnt = 1; /* do not reclaim until I say I do */ newsp->state = IPSEC_SPSTATE_ALIVE; lck_mtx_lock(sadb_mutex); /* * policies of type generate should be at the end of the SPD * because they function as default discard policies - */ - if (newsp->policy == IPSEC_POLICY_GENERATE) + * Don't start timehandler for generate policies + */ + if (newsp->policy == IPSEC_POLICY_GENERATE) { LIST_INSERT_TAIL(&sptree[newsp->spidx.dir], newsp, secpolicy, chain); - else { /* XXX until we have policy ordering in the kernel */ + } else { /* XXX until we have policy ordering in the kernel */ struct secpolicy *tmpsp; LIST_FOREACH(tmpsp, &sptree[newsp->spidx.dir], chain) - if (tmpsp->policy == IPSEC_POLICY_GENERATE) - break; - if (tmpsp) + if (tmpsp->policy == IPSEC_POLICY_GENERATE) { + break; + } + if (tmpsp) { LIST_INSERT_BEFORE(tmpsp, newsp, chain); - else + } else { LIST_INSERT_TAIL(&sptree[newsp->spidx.dir], newsp, secpolicy, chain); + } + key_start_timehandler(); } ipsec_policy_count++; /* Turn off the ipsec bypass */ - if (ipsec_bypass != 0) + if (ipsec_bypass != 0) { ipsec_bypass = 0; + } /* delete the entry in spacqtree */ if (mhp->msg->sadb_msg_type == SADB_X_SPDUPDATE) { @@ -2284,54 +2742,59 @@ key_spdadd( spacq->created = tv.tv_sec; spacq->count = 0; } - } + } lck_mtx_unlock(sadb_mutex); - { - struct mbuf *n, *mpolicy; - struct sadb_msg *newmsg; - int off; + { + struct mbuf *n, *mpolicy; + struct sadb_msg *newmsg; + int off; + + /* create new sadb_msg to reply. */ + if (lft) { + int mbufItems[] = {SADB_EXT_RESERVED, SADB_X_EXT_POLICY, + SADB_EXT_LIFETIME_HARD, SADB_EXT_ADDRESS_SRC, + SADB_EXT_ADDRESS_DST, SADB_X_EXT_ADDR_RANGE_SRC_START, SADB_X_EXT_ADDR_RANGE_SRC_END, + SADB_X_EXT_ADDR_RANGE_DST_START, SADB_X_EXT_ADDR_RANGE_DST_END}; + n = key_gather_mbuf(m, mhp, 2, sizeof(mbufItems) / sizeof(int), mbufItems); + } else { + int mbufItems[] = {SADB_EXT_RESERVED, SADB_X_EXT_POLICY, + SADB_EXT_ADDRESS_SRC, SADB_EXT_ADDRESS_DST, + SADB_X_EXT_ADDR_RANGE_SRC_START, SADB_X_EXT_ADDR_RANGE_SRC_END, + SADB_X_EXT_ADDR_RANGE_DST_START, SADB_X_EXT_ADDR_RANGE_DST_END}; + n = key_gather_mbuf(m, mhp, 2, sizeof(mbufItems) / sizeof(int), mbufItems); + } + if (!n) { + return key_senderror(so, m, ENOBUFS); + } - /* create new sadb_msg to reply. */ - if (lft) { - int mbufItems[] = {SADB_EXT_RESERVED, SADB_X_EXT_POLICY, - SADB_EXT_LIFETIME_HARD, SADB_EXT_ADDRESS_SRC, - SADB_EXT_ADDRESS_DST}; - n = key_gather_mbuf(m, mhp, 2, sizeof(mbufItems)/sizeof(int), mbufItems); - } else { - int mbufItems[] = {SADB_EXT_RESERVED, SADB_X_EXT_POLICY, - SADB_EXT_ADDRESS_SRC, SADB_EXT_ADDRESS_DST}; - n = key_gather_mbuf(m, mhp, 2, sizeof(mbufItems)/sizeof(int), mbufItems); - } - if (!n) - return key_senderror(so, m, ENOBUFS); + if (n->m_len < sizeof(*newmsg)) { + n = m_pullup(n, sizeof(*newmsg)); + if (!n) { + return key_senderror(so, m, ENOBUFS); + } + } + newmsg = mtod(n, struct sadb_msg *); + newmsg->sadb_msg_errno = 0; + newmsg->sadb_msg_len = PFKEY_UNIT64(n->m_pkthdr.len); - if (n->m_len < sizeof(*newmsg)) { - n = m_pullup(n, sizeof(*newmsg)); - if (!n) + off = 0; + mpolicy = m_pulldown(n, PFKEY_ALIGN8(sizeof(struct sadb_msg)), + sizeof(*xpl), &off); + if (mpolicy == NULL) { + /* n is already freed */ return key_senderror(so, m, ENOBUFS); - } - newmsg = mtod(n, struct sadb_msg *); - newmsg->sadb_msg_errno = 0; - newmsg->sadb_msg_len = PFKEY_UNIT64(n->m_pkthdr.len); + } + xpl = (struct sadb_x_policy *)(void *)(mtod(mpolicy, caddr_t) + off); + if (xpl->sadb_x_policy_exttype != SADB_X_EXT_POLICY) { + m_freem(n); + return key_senderror(so, m, EINVAL); + } + xpl->sadb_x_policy_id = newsp->id; - off = 0; - mpolicy = m_pulldown(n, PFKEY_ALIGN8(sizeof(struct sadb_msg)), - sizeof(*xpl), &off); - if (mpolicy == NULL) { - /* n is already freed */ - return key_senderror(so, m, ENOBUFS); - } - xpl = (struct sadb_x_policy *)(void *)(mtod(mpolicy, caddr_t) + off); - if (xpl->sadb_x_policy_exttype != SADB_X_EXT_POLICY) { - m_freem(n); - return key_senderror(so, m, EINVAL); + m_freem(m); + return key_sendup_mbuf(so, n, KEY_SENDUP_ALL); } - xpl->sadb_x_policy_id = newsp->id; - - m_freem(m); - return key_sendup_mbuf(so, n, KEY_SENDUP_ALL); - } } /* @@ -2344,16 +2807,17 @@ static u_int32_t key_getnewspid(void) { u_int32_t newid = 0; - int count = key_spi_trycnt; /* XXX */ + int count = key_spi_trycnt; /* XXX */ struct secpolicy *sp; - + /* when requesting to allocate spi ranged */ lck_mtx_lock(sadb_mutex); while (count--) { newid = (policy_id = (policy_id == ~0 ? 1 : policy_id + 1)); - if ((sp = key_getspbyid(newid)) == NULL) + if ((sp = __key_getspbyid(newid)) == NULL) { break; + } key_freesp(sp, KEY_SADB_LOCKED); } @@ -2384,45 +2848,62 @@ key_spddelete( struct mbuf *m, const struct sadb_msghdr *mhp) { - struct sadb_address *src0, *dst0; + struct sadb_address *src0, *dst0, *src1 = NULL, *dst1 = NULL; struct sadb_x_policy *xpl0; struct secpolicyindex spidx; struct secpolicy *sp; + ifnet_t internal_if = NULL; + struct sadb_x_ipsecif *ipsecifopts = NULL; + int use_src_range = 0; + int use_dst_range = 0; + + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); - /* sanity check */ - if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) + if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) { panic("key_spddelete: NULL pointer is passed.\n"); + } - if (mhp->ext[SADB_EXT_ADDRESS_SRC] == NULL || - mhp->ext[SADB_EXT_ADDRESS_DST] == NULL || + if (mhp->ext[SADB_X_EXT_ADDR_RANGE_SRC_START] != NULL && mhp->ext[SADB_X_EXT_ADDR_RANGE_SRC_END] != NULL) { + use_src_range = 1; + } + if (mhp->ext[SADB_X_EXT_ADDR_RANGE_DST_START] != NULL && mhp->ext[SADB_X_EXT_ADDR_RANGE_DST_END] != NULL) { + use_dst_range = 1; + } + + if ((!use_src_range && mhp->ext[SADB_EXT_ADDRESS_SRC] == NULL) || + (!use_dst_range && mhp->ext[SADB_EXT_ADDRESS_DST] == NULL) || mhp->ext[SADB_X_EXT_POLICY] == NULL) { ipseclog((LOG_DEBUG, "key_spddelete: invalid message is passed.\n")); return key_senderror(so, m, EINVAL); } - if (mhp->extlen[SADB_EXT_ADDRESS_SRC] < sizeof(struct sadb_address) || - mhp->extlen[SADB_EXT_ADDRESS_DST] < sizeof(struct sadb_address) || + if ((use_src_range && (mhp->extlen[SADB_X_EXT_ADDR_RANGE_SRC_START] < sizeof(struct sadb_address) + || mhp->extlen[SADB_X_EXT_ADDR_RANGE_SRC_END] < sizeof(struct sadb_address))) || + (!use_src_range && mhp->extlen[SADB_EXT_ADDRESS_SRC] < sizeof(struct sadb_address)) || + (use_dst_range && (mhp->extlen[SADB_X_EXT_ADDR_RANGE_DST_START] < sizeof(struct sadb_address) + || mhp->extlen[SADB_X_EXT_ADDR_RANGE_DST_END] < sizeof(struct sadb_address))) || + (!use_dst_range && mhp->extlen[SADB_EXT_ADDRESS_DST] < sizeof(struct sadb_address)) || mhp->extlen[SADB_X_EXT_POLICY] < sizeof(struct sadb_x_policy)) { ipseclog((LOG_DEBUG, "key_spddelete: invalid message is passed.\n")); return key_senderror(so, m, EINVAL); } - src0 = (struct sadb_address *)mhp->ext[SADB_EXT_ADDRESS_SRC]; - dst0 = (struct sadb_address *)mhp->ext[SADB_EXT_ADDRESS_DST]; + if (use_src_range) { + src0 = (struct sadb_address *)mhp->ext[SADB_X_EXT_ADDR_RANGE_SRC_START]; + src1 = (struct sadb_address *)mhp->ext[SADB_X_EXT_ADDR_RANGE_SRC_END]; + } else { + src0 = (struct sadb_address *)mhp->ext[SADB_EXT_ADDRESS_SRC]; + } + if (use_dst_range) { + dst0 = (struct sadb_address *)mhp->ext[SADB_X_EXT_ADDR_RANGE_DST_START]; + dst1 = (struct sadb_address *)mhp->ext[SADB_X_EXT_ADDR_RANGE_DST_END]; + } else { + dst0 = (struct sadb_address *)mhp->ext[SADB_EXT_ADDRESS_DST]; + } xpl0 = (struct sadb_x_policy *)(void *)mhp->ext[SADB_X_EXT_POLICY]; + ipsecifopts = (struct sadb_x_ipsecif *)(void *)mhp->ext[SADB_X_EXT_IPSECIF]; - /* make secindex */ - /* XXX boundary check against sa_len */ - KEY_SETSECSPIDX(xpl0->sadb_x_policy_dir, - src0 + 1, - dst0 + 1, - src0->sadb_address_prefixlen, - dst0->sadb_address_prefixlen, - src0->sadb_address_proto, - &spidx); - - /* checking the direciton. */ + /* checking the direction. */ switch (xpl0->sadb_x_policy_dir) { case IPSEC_DIR_INBOUND: case IPSEC_DIR_OUTBOUND: @@ -2432,14 +2913,45 @@ key_spddelete( return key_senderror(so, m, EINVAL); } + /* Process interfaces */ + if (ipsecifopts != NULL) { + if (ipsecifopts->sadb_x_ipsecif_internal_if[0]) { + ifnet_find_by_name(ipsecifopts->sadb_x_ipsecif_internal_if, &internal_if); + } + } + + /* make secindex */ + /* XXX boundary check against sa_len */ + KEY_SETSECSPIDX(xpl0->sadb_x_policy_dir, + src0 + 1, + dst0 + 1, + src0->sadb_address_prefixlen, + dst0->sadb_address_prefixlen, + src0->sadb_address_proto, + internal_if, + use_src_range ? src0 + 1 : NULL, + use_src_range ? src1 + 1 : NULL, + use_dst_range ? dst0 + 1 : NULL, + use_dst_range ? dst1 + 1 : NULL, + &spidx); + /* Is there SP in SPD ? */ lck_mtx_lock(sadb_mutex); if ((sp = key_getsp(&spidx)) == NULL) { ipseclog((LOG_DEBUG, "key_spddelete: no SP found.\n")); lck_mtx_unlock(sadb_mutex); + if (internal_if) { + ifnet_release(internal_if); + internal_if = NULL; + } return key_senderror(so, m, EINVAL); } + if (internal_if) { + ifnet_release(internal_if); + internal_if = NULL; + } + /* save policy id to buffer to be returned. */ xpl0->sadb_x_policy_id = sp->id; @@ -2448,24 +2960,27 @@ key_spddelete( lck_mtx_unlock(sadb_mutex); - { - struct mbuf *n; - struct sadb_msg *newmsg; - int mbufItems[] = {SADB_EXT_RESERVED, SADB_X_EXT_POLICY, - SADB_EXT_ADDRESS_SRC, SADB_EXT_ADDRESS_DST}; - - /* create new sadb_msg to reply. */ - n = key_gather_mbuf(m, mhp, 1, sizeof(mbufItems)/sizeof(int), mbufItems); - if (!n) - return key_senderror(so, m, ENOBUFS); + { + struct mbuf *n; + struct sadb_msg *newmsg; + int mbufItems[] = {SADB_EXT_RESERVED, SADB_X_EXT_POLICY, + SADB_EXT_ADDRESS_SRC, SADB_EXT_ADDRESS_DST, + SADB_X_EXT_ADDR_RANGE_SRC_START, SADB_X_EXT_ADDR_RANGE_SRC_END, + SADB_X_EXT_ADDR_RANGE_DST_START, SADB_X_EXT_ADDR_RANGE_DST_END}; + + /* create new sadb_msg to reply. */ + n = key_gather_mbuf(m, mhp, 1, sizeof(mbufItems) / sizeof(int), mbufItems); + if (!n) { + return key_senderror(so, m, ENOBUFS); + } - newmsg = mtod(n, struct sadb_msg *); - newmsg->sadb_msg_errno = 0; - newmsg->sadb_msg_len = PFKEY_UNIT64(n->m_pkthdr.len); + newmsg = mtod(n, struct sadb_msg *); + newmsg->sadb_msg_errno = 0; + newmsg->sadb_msg_len = PFKEY_UNIT64(n->m_pkthdr.len); - m_freem(m); - return key_sendup_mbuf(so, n, KEY_SENDUP_ALL); - } + m_freem(m); + return key_sendup_mbuf(so, n, KEY_SENDUP_ALL); + } } /* @@ -2489,11 +3004,12 @@ key_spddelete2( u_int32_t id; struct secpolicy *sp; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); - + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); + /* sanity check */ - if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) + if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) { panic("key_spddelete2: NULL pointer is passed.\n"); + } if (mhp->ext[SADB_X_EXT_POLICY] == NULL || mhp->extlen[SADB_X_EXT_POLICY] < sizeof(struct sadb_x_policy)) { @@ -2507,7 +3023,7 @@ key_spddelete2( /* Is there SP in SPD ? */ lck_mtx_lock(sadb_mutex); - if ((sp = key_getspbyid(id)) == NULL) { + if ((sp = __key_getspbyid(id)) == NULL) { lck_mtx_unlock(sadb_mutex); ipseclog((LOG_DEBUG, "key_spddelete2: no SP found id:%u.\n", id)); return key_senderror(so, m, EINVAL); @@ -2517,57 +3033,187 @@ key_spddelete2( key_freesp(sp, KEY_SADB_LOCKED); lck_mtx_unlock(sadb_mutex); - { - struct mbuf *n, *nn; - struct sadb_msg *newmsg; - int off, len; + { + struct mbuf *n, *nn; + struct sadb_msg *newmsg; + int off, len; - /* create new sadb_msg to reply. */ - len = PFKEY_ALIGN8(sizeof(struct sadb_msg)); + /* create new sadb_msg to reply. */ + len = PFKEY_ALIGN8(sizeof(struct sadb_msg)); - if (len > MCLBYTES) - return key_senderror(so, m, ENOBUFS); - MGETHDR(n, M_WAITOK, MT_DATA); - if (n && len > MHLEN) { - MCLGET(n, M_WAITOK); - if ((n->m_flags & M_EXT) == 0) { - m_freem(n); - n = NULL; + if (len > MCLBYTES) { + return key_senderror(so, m, ENOBUFS); + } + MGETHDR(n, M_WAITOK, MT_DATA); + if (n && len > MHLEN) { + MCLGET(n, M_WAITOK); + if ((n->m_flags & M_EXT) == 0) { + m_freem(n); + n = NULL; + } + } + if (!n) { + return key_senderror(so, m, ENOBUFS); } - } - if (!n) - return key_senderror(so, m, ENOBUFS); - n->m_len = len; - n->m_next = NULL; - off = 0; + n->m_len = len; + n->m_next = NULL; + off = 0; - m_copydata(m, 0, sizeof(struct sadb_msg), mtod(n, caddr_t) + off); - off += PFKEY_ALIGN8(sizeof(struct sadb_msg)); + m_copydata(m, 0, sizeof(struct sadb_msg), mtod(n, caddr_t) + off); + off += PFKEY_ALIGN8(sizeof(struct sadb_msg)); #if DIAGNOSTIC - if (off != len) - panic("length inconsistency in key_spddelete2"); + if (off != len) { + panic("length inconsistency in key_spddelete2"); + } #endif - n->m_next = m_copym(m, mhp->extoff[SADB_X_EXT_POLICY], - mhp->extlen[SADB_X_EXT_POLICY], M_WAITOK); - if (!n->m_next) { - m_freem(n); - return key_senderror(so, m, ENOBUFS); + n->m_next = m_copym(m, mhp->extoff[SADB_X_EXT_POLICY], + mhp->extlen[SADB_X_EXT_POLICY], M_WAITOK); + if (!n->m_next) { + m_freem(n); + return key_senderror(so, m, ENOBUFS); + } + + n->m_pkthdr.len = 0; + for (nn = n; nn; nn = nn->m_next) { + n->m_pkthdr.len += nn->m_len; + } + + newmsg = mtod(n, struct sadb_msg *); + newmsg->sadb_msg_errno = 0; + newmsg->sadb_msg_len = PFKEY_UNIT64(n->m_pkthdr.len); + + m_freem(m); + return key_sendup_mbuf(so, n, KEY_SENDUP_ALL); } +} + +static int +key_spdenable( + struct socket *so, + struct mbuf *m, + const struct sadb_msghdr *mhp) +{ + u_int32_t id; + struct secpolicy *sp; - n->m_pkthdr.len = 0; - for (nn = n; nn; nn = nn->m_next) - n->m_pkthdr.len += nn->m_len; + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); - newmsg = mtod(n, struct sadb_msg *); - newmsg->sadb_msg_errno = 0; - newmsg->sadb_msg_len = PFKEY_UNIT64(n->m_pkthdr.len); + /* sanity check */ + if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) { + panic("key_spdenable: NULL pointer is passed.\n"); + } - m_freem(m); - return key_sendup_mbuf(so, n, KEY_SENDUP_ALL); - } + if (mhp->ext[SADB_X_EXT_POLICY] == NULL || + mhp->extlen[SADB_X_EXT_POLICY] < sizeof(struct sadb_x_policy)) { + ipseclog((LOG_DEBUG, "key_spdenable: invalid message is passed.\n")); + key_senderror(so, m, EINVAL); + return 0; + } + + id = ((struct sadb_x_policy *) + (void *)mhp->ext[SADB_X_EXT_POLICY])->sadb_x_policy_id; + + /* Is there SP in SPD ? */ + lck_mtx_lock(sadb_mutex); + if ((sp = __key_getspbyid(id)) == NULL) { + lck_mtx_unlock(sadb_mutex); + ipseclog((LOG_DEBUG, "key_spdenable: no SP found id:%u.\n", id)); + return key_senderror(so, m, EINVAL); + } + + sp->disabled = 0; + lck_mtx_unlock(sadb_mutex); + + { + struct mbuf *n; + struct sadb_msg *newmsg; + int mbufItems[] = {SADB_EXT_RESERVED, SADB_X_EXT_POLICY}; + + /* create new sadb_msg to reply. */ + n = key_gather_mbuf(m, mhp, 1, sizeof(mbufItems) / sizeof(int), mbufItems); + if (!n) { + return key_senderror(so, m, ENOBUFS); + } + + if (n->m_len < sizeof(struct sadb_msg)) { + n = m_pullup(n, sizeof(struct sadb_msg)); + if (n == NULL) { + return key_senderror(so, m, ENOBUFS); + } + } + newmsg = mtod(n, struct sadb_msg *); + newmsg->sadb_msg_errno = 0; + newmsg->sadb_msg_len = PFKEY_UNIT64(n->m_pkthdr.len); + + m_freem(m); + return key_sendup_mbuf(so, n, KEY_SENDUP_ALL); + } +} + +static int +key_spddisable( + struct socket *so, + struct mbuf *m, + const struct sadb_msghdr *mhp) +{ + u_int32_t id; + struct secpolicy *sp; + + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); + + /* sanity check */ + if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) { + panic("key_spddisable: NULL pointer is passed.\n"); + } + + if (mhp->ext[SADB_X_EXT_POLICY] == NULL || + mhp->extlen[SADB_X_EXT_POLICY] < sizeof(struct sadb_x_policy)) { + ipseclog((LOG_DEBUG, "key_spddisable: invalid message is passed.\n")); + key_senderror(so, m, EINVAL); + return 0; + } + + id = ((struct sadb_x_policy *) + (void *)mhp->ext[SADB_X_EXT_POLICY])->sadb_x_policy_id; + + /* Is there SP in SPD ? */ + lck_mtx_lock(sadb_mutex); + if ((sp = __key_getspbyid(id)) == NULL) { + lck_mtx_unlock(sadb_mutex); + ipseclog((LOG_DEBUG, "key_spddisable: no SP found id:%u.\n", id)); + return key_senderror(so, m, EINVAL); + } + + sp->disabled = 1; + lck_mtx_unlock(sadb_mutex); + + { + struct mbuf *n; + struct sadb_msg *newmsg; + int mbufItems[] = {SADB_EXT_RESERVED, SADB_X_EXT_POLICY}; + + /* create new sadb_msg to reply. */ + n = key_gather_mbuf(m, mhp, 1, sizeof(mbufItems) / sizeof(int), mbufItems); + if (!n) { + return key_senderror(so, m, ENOBUFS); + } + + if (n->m_len < sizeof(struct sadb_msg)) { + n = m_pullup(n, sizeof(struct sadb_msg)); + if (n == NULL) { + return key_senderror(so, m, ENOBUFS); + } + } + newmsg = mtod(n, struct sadb_msg *); + newmsg->sadb_msg_errno = 0; + newmsg->sadb_msg_len = PFKEY_UNIT64(n->m_pkthdr.len); + + m_freem(m); + return key_sendup_mbuf(so, n, KEY_SENDUP_ALL); + } } /* @@ -2592,11 +3238,12 @@ key_spdget( struct secpolicy *sp; struct mbuf *n; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); - + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); + /* sanity check */ - if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) + if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) { panic("key_spdget: NULL pointer is passed.\n"); + } if (mhp->ext[SADB_X_EXT_POLICY] == NULL || mhp->extlen[SADB_X_EXT_POLICY] < sizeof(struct sadb_x_policy)) { @@ -2609,7 +3256,7 @@ key_spdget( /* Is there SP in SPD ? */ lck_mtx_lock(sadb_mutex); - if ((sp = key_getspbyid(id)) == NULL) { + if ((sp = __key_getspbyid(id)) == NULL) { ipseclog((LOG_DEBUG, "key_spdget: no SP found id:%u.\n", id)); lck_mtx_unlock(sadb_mutex); return key_senderror(so, m, ENOENT); @@ -2619,8 +3266,9 @@ key_spdget( if (n != NULL) { m_freem(m); return key_sendup_mbuf(so, n, KEY_SENDUP_ONE); - } else + } else { return key_senderror(so, m, ENOBUFS); + } } /* @@ -2646,15 +3294,18 @@ key_spdacquire( struct secspacq *newspacq; int error; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); - + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); + /* sanity check */ - if (sp == NULL) + if (sp == NULL) { panic("key_spdacquire: NULL pointer is passed.\n"); - if (sp->req != NULL) + } + if (sp->req != NULL) { panic("key_spdacquire: called but there is request.\n"); - if (sp->policy != IPSEC_POLICY_IPSEC) + } + if (sp->policy != IPSEC_POLICY_IPSEC) { panic("key_spdacquire: policy mismathed. IPsec is expected.\n"); + } /* get a entry to check whether sent message or not. */ lck_mtx_lock(sadb_mutex); @@ -2676,6 +3327,7 @@ key_spdacquire( } /* add to acqtree */ LIST_INSERT_HEAD(&spacqtree, newspacq, chain); + key_start_timehandler(); } lck_mtx_unlock(sadb_mutex); /* create new sadb_msg to reply. */ @@ -2687,8 +3339,9 @@ key_spdacquire( result = m; result->m_pkthdr.len = 0; - for (m = result; m; m = m->m_next) + for (m = result; m; m = m->m_next) { result->m_pkthdr.len += m->m_len; + } mtod(result, struct sadb_msg *)->sadb_msg_len = PFKEY_UNIT64(result->m_pkthdr.len); @@ -2696,8 +3349,9 @@ key_spdacquire( return key_sendup_mbuf(NULL, m, KEY_SENDUP_REGISTERED); fail: - if (result) + if (result) { m_freem(result); + } return error; } @@ -2722,13 +3376,15 @@ key_spdflush( struct sadb_msg *newmsg; struct secpolicy *sp; u_int dir; - + /* sanity check */ - if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) + if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) { panic("key_spdflush: NULL pointer is passed.\n"); + } - if (m->m_len != PFKEY_ALIGN8(sizeof(struct sadb_msg))) + if (m->m_len != PFKEY_ALIGN8(sizeof(struct sadb_msg))) { return key_senderror(so, m, EINVAL); + } lck_mtx_lock(sadb_mutex); for (dir = 0; dir < IPSEC_DIR_MAX; dir++) { @@ -2737,14 +3393,15 @@ key_spdflush( } } lck_mtx_unlock(sadb_mutex); - + if (sizeof(struct sadb_msg) > m->m_len + M_TRAILINGSPACE(m)) { ipseclog((LOG_DEBUG, "key_spdflush: No more memory.\n")); return key_senderror(so, m, ENOBUFS); } - if (m->m_next) + if (m->m_next) { m_freem(m->m_next); + } m->m_next = NULL; m->m_pkthdr.len = m->m_len = PFKEY_ALIGN8(sizeof(struct sadb_msg)); newmsg = mtod(m, struct sadb_msg *); @@ -2765,7 +3422,7 @@ key_spdflush( * * m will always be freed. */ - + static int key_spddump( struct socket *so, @@ -2777,16 +3434,17 @@ key_spddump( u_int dir; struct mbuf *n; int error = 0; - + /* sanity check */ - if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) + if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) { panic("key_spddump: NULL pointer is passed.\n"); + } if ((bufcount = ipsec_policy_count) == 0) { error = ENOENT; goto end; } - bufcount += 256; /* extra */ + bufcount += 256; /* extra */ KMALLOC_WAIT(spbuf, struct secpolicy**, bufcount * sizeof(struct secpolicy*)); if (spbuf == NULL) { ipseclog((LOG_DEBUG, "key_spddump: No more memory.\n")); @@ -2798,8 +3456,9 @@ key_spddump( sp_ptr = spbuf; for (dir = 0; dir < IPSEC_DIR_MAX; dir++) { LIST_FOREACH(sp, &sptree[dir], chain) { - if (cnt == bufcount) - break; /* buffer full */ + if (cnt == bufcount) { + break; /* buffer full */ + } *sp_ptr++ = sp; sp->refcnt++; cnt++; @@ -2811,31 +3470,34 @@ key_spddump( error = ENOENT; goto end; } - + sp_ptr = spbuf; while (cnt) { --cnt; n = key_setdumpsp(*sp_ptr++, SADB_X_SPDDUMP, cnt, - mhp->msg->sadb_msg_pid); + mhp->msg->sadb_msg_pid); - if (n) + if (n) { key_sendup_mbuf(so, n, KEY_SENDUP_ONE); + } } - + lck_mtx_lock(sadb_mutex); - while (sp_ptr > spbuf) + while (sp_ptr > spbuf) { key_freesp(*(--sp_ptr), KEY_SADB_LOCKED); + } lck_mtx_unlock(sadb_mutex); - -end: - if (spbuf) + +end: + if (spbuf) { KFREE(spbuf); - if (error) + } + if (error) { return key_senderror(so, m, error); + } m_freem(m); return 0; - } static struct mbuf * @@ -2848,41 +3510,92 @@ key_setdumpsp( struct mbuf *result = NULL, *m; m = key_setsadbmsg(type, 0, SADB_SATYPE_UNSPEC, seq, pid, sp->refcnt); - if (!m) + if (!m) { goto fail; + } result = m; - m = key_setsadbaddr(SADB_EXT_ADDRESS_SRC, - (struct sockaddr *)&sp->spidx.src, sp->spidx.prefs, - sp->spidx.ul_proto); - if (!m) - goto fail; - m_cat(result, m); + if (sp->spidx.src_range.start.ss_len > 0) { + m = key_setsadbaddr(SADB_X_EXT_ADDR_RANGE_SRC_START, + (struct sockaddr *)&sp->spidx.src_range.start, sp->spidx.prefs, + sp->spidx.ul_proto); + if (!m) { + goto fail; + } + m_cat(result, m); - m = key_setsadbaddr(SADB_EXT_ADDRESS_DST, - (struct sockaddr *)&sp->spidx.dst, sp->spidx.prefd, - sp->spidx.ul_proto); - if (!m) - goto fail; - m_cat(result, m); + m = key_setsadbaddr(SADB_X_EXT_ADDR_RANGE_SRC_END, + (struct sockaddr *)&sp->spidx.src_range.end, sp->spidx.prefs, + sp->spidx.ul_proto); + if (!m) { + goto fail; + } + m_cat(result, m); + } else { + m = key_setsadbaddr(SADB_EXT_ADDRESS_SRC, + (struct sockaddr *)&sp->spidx.src, sp->spidx.prefs, + sp->spidx.ul_proto); + if (!m) { + goto fail; + } + m_cat(result, m); + } + + if (sp->spidx.dst_range.start.ss_len > 0) { + m = key_setsadbaddr(SADB_X_EXT_ADDR_RANGE_DST_START, + (struct sockaddr *)&sp->spidx.dst_range.start, sp->spidx.prefd, + sp->spidx.ul_proto); + if (!m) { + goto fail; + } + m_cat(result, m); + + m = key_setsadbaddr(SADB_X_EXT_ADDR_RANGE_DST_END, + (struct sockaddr *)&sp->spidx.dst_range.end, sp->spidx.prefd, + sp->spidx.ul_proto); + if (!m) { + goto fail; + } + m_cat(result, m); + } else { + m = key_setsadbaddr(SADB_EXT_ADDRESS_DST, + (struct sockaddr *)&sp->spidx.dst, sp->spidx.prefd, + sp->spidx.ul_proto); + if (!m) { + goto fail; + } + m_cat(result, m); + } + + if (sp->spidx.internal_if || sp->outgoing_if || sp->ipsec_if || sp->disabled) { + m = key_setsadbipsecif(sp->spidx.internal_if, sp->outgoing_if, sp->ipsec_if, sp->disabled); + if (!m) { + goto fail; + } + m_cat(result, m); + } m = key_sp2msg(sp); - if (!m) + if (!m) { goto fail; + } m_cat(result, m); - if ((result->m_flags & M_PKTHDR) == 0) + if ((result->m_flags & M_PKTHDR) == 0) { goto fail; + } if (result->m_len < sizeof(struct sadb_msg)) { result = m_pullup(result, sizeof(struct sadb_msg)); - if (result == NULL) + if (result == NULL) { goto fail; + } } result->m_pkthdr.len = 0; - for (m = result; m; m = m->m_next) + for (m = result; m; m = m->m_next) { result->m_pkthdr.len += m->m_len; + } mtod(result, struct sadb_msg *)->sadb_msg_len = PFKEY_UNIT64(result->m_pkthdr.len); @@ -2906,22 +3619,23 @@ key_getspreqmsglen( tlen = sizeof(struct sadb_x_policy); /* if is the policy for ipsec ? */ - if (sp->policy != IPSEC_POLICY_IPSEC) + if (sp->policy != IPSEC_POLICY_IPSEC) { return tlen; + } /* get length of ipsec requests */ - { - struct ipsecrequest *isr; - int len; + { + struct ipsecrequest *isr; + int len; - for (isr = sp->req; isr != NULL; isr = isr->next) { - len = sizeof(struct sadb_x_ipsecrequest) - + isr->saidx.src.ss_len - + isr->saidx.dst.ss_len; + for (isr = sp->req; isr != NULL; isr = isr->next) { + len = sizeof(struct sadb_x_ipsecrequest) + + isr->saidx.src.ss_len + + isr->saidx.dst.ss_len; - tlen += PFKEY_ALIGN8(len); + tlen += PFKEY_ALIGN8(len); + } } - } return tlen; } @@ -2944,11 +3658,12 @@ key_spdexpire( int error = EINVAL; struct sadb_lifetime *lt; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); - + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); + /* sanity check */ - if (sp == NULL) + if (sp == NULL) { panic("key_spdexpire: NULL pointer is passed.\n"); + } /* set msg header */ m = key_setsadbmsg(SADB_X_SPDEXPIRE, 0, 0, 0, 0, 0); @@ -2961,9 +3676,10 @@ key_spdexpire( /* create lifetime extension (current and hard) */ len = PFKEY_ALIGN8(sizeof(*lt)) * 2; m = key_alloc_mbuf(len); - if (!m || m->m_next) { /*XXX*/ - if (m) + if (!m || m->m_next) { /*XXX*/ + if (m) { m_freem(m); + } error = ENOBUFS; goto fail; } @@ -2984,25 +3700,65 @@ key_spdexpire( lt->sadb_lifetime_usetime = sp->validtime; m_cat(result, m); - /* set sadb_address for source */ - m = key_setsadbaddr(SADB_EXT_ADDRESS_SRC, - (struct sockaddr *)&sp->spidx.src, - sp->spidx.prefs, sp->spidx.ul_proto); - if (!m) { - error = ENOBUFS; - goto fail; + /* set sadb_address(es) for source */ + if (sp->spidx.src_range.start.ss_len > 0) { + m = key_setsadbaddr(SADB_X_EXT_ADDR_RANGE_SRC_START, + (struct sockaddr *)&sp->spidx.src_range.start, sp->spidx.prefs, + sp->spidx.ul_proto); + if (!m) { + error = ENOBUFS; + goto fail; + } + m_cat(result, m); + + m = key_setsadbaddr(SADB_X_EXT_ADDR_RANGE_SRC_END, + (struct sockaddr *)&sp->spidx.src_range.end, sp->spidx.prefs, + sp->spidx.ul_proto); + if (!m) { + error = ENOBUFS; + goto fail; + } + m_cat(result, m); + } else { + m = key_setsadbaddr(SADB_EXT_ADDRESS_SRC, + (struct sockaddr *)&sp->spidx.src, sp->spidx.prefs, + sp->spidx.ul_proto); + if (!m) { + error = ENOBUFS; + goto fail; + } + m_cat(result, m); } - m_cat(result, m); - /* set sadb_address for destination */ - m = key_setsadbaddr(SADB_EXT_ADDRESS_DST, - (struct sockaddr *)&sp->spidx.dst, - sp->spidx.prefd, sp->spidx.ul_proto); - if (!m) { - error = ENOBUFS; - goto fail; + /* set sadb_address(es) for dest */ + if (sp->spidx.dst_range.start.ss_len > 0) { + m = key_setsadbaddr(SADB_X_EXT_ADDR_RANGE_DST_START, + (struct sockaddr *)&sp->spidx.dst_range.start, sp->spidx.prefd, + sp->spidx.ul_proto); + if (!m) { + error = ENOBUFS; + goto fail; + } + m_cat(result, m); + + m = key_setsadbaddr(SADB_X_EXT_ADDR_RANGE_DST_END, + (struct sockaddr *)&sp->spidx.dst_range.end, sp->spidx.prefd, + sp->spidx.ul_proto); + if (!m) { + error = ENOBUFS; + goto fail; + } + m_cat(result, m); + } else { + m = key_setsadbaddr(SADB_EXT_ADDRESS_DST, + (struct sockaddr *)&sp->spidx.dst, sp->spidx.prefd, + sp->spidx.ul_proto); + if (!m) { + error = ENOBUFS; + goto fail; + } + m_cat(result, m); } - m_cat(result, m); /* set secpolicy */ m = key_sp2msg(sp); @@ -3026,17 +3782,19 @@ key_spdexpire( } result->m_pkthdr.len = 0; - for (m = result; m; m = m->m_next) + for (m = result; m; m = m->m_next) { result->m_pkthdr.len += m->m_len; + } mtod(result, struct sadb_msg *)->sadb_msg_len = PFKEY_UNIT64(result->m_pkthdr.len); return key_sendup_mbuf(NULL, result, KEY_SENDUP_REGISTERED); - fail: - if (result) +fail: + if (result) { m_freem(result); + } return error; } @@ -3047,50 +3805,59 @@ key_spdexpire( * others : pointer to new SA head. */ static struct secashead * -key_newsah( - struct secasindex *saidx, - u_int8_t dir) +key_newsah(struct secasindex *saidx, + ifnet_t ipsec_if, + u_int outgoing_if, + u_int8_t dir) { struct secashead *newsah; /* sanity check */ - if (saidx == NULL) + if (saidx == NULL) { panic("key_newsaidx: NULL pointer is passed.\n"); + } newsah = keydb_newsecashead(); - if (newsah == NULL) + if (newsah == NULL) { return NULL; + } bcopy(saidx, &newsah->saidx, sizeof(newsah->saidx)); - + /* remove the ports */ switch (saidx->src.ss_family) { - case AF_INET: - ((struct sockaddr_in *)(&newsah->saidx.src))->sin_port = IPSEC_PORT_ANY; - break; - case AF_INET6: - ((struct sockaddr_in6 *)(&newsah->saidx.src))->sin6_port = IPSEC_PORT_ANY; - break; - default: - break; + case AF_INET: + ((struct sockaddr_in *)(&newsah->saidx.src))->sin_port = IPSEC_PORT_ANY; + break; + case AF_INET6: + ((struct sockaddr_in6 *)(&newsah->saidx.src))->sin6_port = IPSEC_PORT_ANY; + break; + default: + break; } switch (saidx->dst.ss_family) { - case AF_INET: - ((struct sockaddr_in *)(&newsah->saidx.dst))->sin_port = IPSEC_PORT_ANY; - break; - case AF_INET6: - ((struct sockaddr_in6 *)(&newsah->saidx.dst))->sin6_port = IPSEC_PORT_ANY; - break; - default: - break; - } + case AF_INET: + ((struct sockaddr_in *)(&newsah->saidx.dst))->sin_port = IPSEC_PORT_ANY; + break; + case AF_INET6: + ((struct sockaddr_in6 *)(&newsah->saidx.dst))->sin6_port = IPSEC_PORT_ANY; + break; + default: + break; + } + newsah->outgoing_if = outgoing_if; + if (ipsec_if) { + ifnet_reference(ipsec_if); + newsah->ipsec_if = ipsec_if; + } newsah->dir = dir; /* add to saidxtree */ newsah->state = SADB_SASTATE_MATURE; LIST_INSERT_HEAD(&sahtree, newsah, chain); + key_start_timehandler(); - return(newsah); + return newsah; } /* @@ -3104,22 +3871,21 @@ key_delsah( u_int stateidx, state; int zombie = 0; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED); + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); /* sanity check */ - if (sah == NULL) + if (sah == NULL) { panic("key_delsah: NULL pointer is passed.\n"); + } /* searching all SA registerd in the secindex. */ for (stateidx = 0; - stateidx < _ARRAYLEN(saorder_state_any); - stateidx++) { - + stateidx < _ARRAYLEN(saorder_state_any); + stateidx++) { state = saorder_state_any[stateidx]; for (sav = (struct secasvar *)LIST_FIRST(&sah->savtree[state]); - sav != NULL; - sav = nextsav) { - + sav != NULL; + sav = nextsav) { nextsav = LIST_NEXT(sav, chain); if (sav->refcnt > 0) { @@ -3140,17 +3906,29 @@ key_delsah( } /* don't delete sah only if there are savs. */ - if (zombie) + if (zombie) { return; + } + + ROUTE_RELEASE(&sah->sa_route); + + if (sah->ipsec_if) { + ifnet_release(sah->ipsec_if); + sah->ipsec_if = NULL; + } - if (sah->sa_route.ro_rt) { - rtfree(sah->sa_route.ro_rt); - sah->sa_route.ro_rt = (struct rtentry *)NULL; + if (sah->idents) { + KFREE(sah->idents); + } + + if (sah->identd) { + KFREE(sah->identd); } /* remove from tree of SA index */ - if (__LIST_CHAINED(sah)) + if (__LIST_CHAINED(sah)) { LIST_REMOVE(sah, chain); + } KFREE(sah); @@ -3174,16 +3952,18 @@ key_newsav( struct mbuf *m, const struct sadb_msghdr *mhp, struct secashead *sah, - int *errp) + int *errp, + struct socket *so) { struct secasvar *newsav; const struct sadb_sa *xsa; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED); + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); /* sanity check */ - if (m == NULL || mhp == NULL || mhp->msg == NULL || sah == NULL) + if (m == NULL || mhp == NULL || mhp->msg == NULL || sah == NULL) { panic("key_newsa: NULL pointer is passed.\n"); + } KMALLOC_NOWAIT(newsav, struct secasvar *, sizeof(struct secasvar)); if (newsav == NULL) { @@ -3204,18 +3984,18 @@ key_newsav( #if IPSEC_DOSEQCHECK /* sync sequence number */ - if (mhp->msg->sadb_msg_seq == 0) + if (mhp->msg->sadb_msg_seq == 0) { newsav->seq = - (acq_seq = (acq_seq == ~0 ? 1 : ++acq_seq)); - else + (acq_seq = (acq_seq == ~0 ? 1 : ++acq_seq)); + } else #endif - newsav->seq = mhp->msg->sadb_msg_seq; + newsav->seq = mhp->msg->sadb_msg_seq; break; case SADB_ADD: /* sanity check */ if (mhp->ext[SADB_EXT_SA] == NULL) { - KFREE(newsav); + key_delsav(newsav); ipseclog((LOG_DEBUG, "key_newsa: invalid message is passed.\n")); *errp = EINVAL; return NULL; @@ -3225,28 +4005,82 @@ key_newsav( newsav->seq = mhp->msg->sadb_msg_seq; break; default: - KFREE(newsav); + key_delsav(newsav); *errp = EINVAL; return NULL; } + if (mhp->ext[SADB_X_EXT_SA2] != NULL) { + if (((struct sadb_x_sa2 *)(void *)mhp->ext[SADB_X_EXT_SA2])->sadb_x_sa2_alwaysexpire) { + newsav->always_expire = 1; + } + newsav->flags2 = ((struct sadb_x_sa2 *)(void *)mhp->ext[SADB_X_EXT_SA2])->sadb_x_sa2_flags; + if (newsav->flags2 & SADB_X_EXT_SA2_DELETE_ON_DETACH) { + newsav->so = so; + } + } + /* copy sav values */ if (mhp->msg->sadb_msg_type != SADB_GETSPI) { *errp = key_setsaval(newsav, m, mhp); if (*errp) { - if (newsav->spihash.le_prev || newsav->spihash.le_next) - LIST_REMOVE(newsav, spihash); - KFREE(newsav); + key_delsav(newsav); return NULL; } + } else { + /* For get SPI, if has a hard lifetime, apply */ + const struct sadb_lifetime *lft0; + struct timeval tv; + + lft0 = (struct sadb_lifetime *)(void *)mhp->ext[SADB_EXT_LIFETIME_HARD]; + if (lft0 != NULL) { + /* make lifetime for CURRENT */ + KMALLOC_NOWAIT(newsav->lft_c, struct sadb_lifetime *, + sizeof(struct sadb_lifetime)); + if (newsav->lft_c == NULL) { + lck_mtx_unlock(sadb_mutex); + KMALLOC_WAIT(newsav->lft_c, struct sadb_lifetime *, + sizeof(struct sadb_lifetime)); + lck_mtx_lock(sadb_mutex); + if (newsav->lft_c == NULL) { + ipseclog((LOG_DEBUG, "key_newsa: No more memory.\n")); + key_delsav(newsav); + *errp = ENOBUFS; + return NULL; + } + } + + microtime(&tv); + + newsav->lft_c->sadb_lifetime_len = PFKEY_UNIT64(sizeof(struct sadb_lifetime)); + newsav->lft_c->sadb_lifetime_exttype = SADB_EXT_LIFETIME_CURRENT; + newsav->lft_c->sadb_lifetime_allocations = 0; + newsav->lft_c->sadb_lifetime_bytes = 0; + newsav->lft_c->sadb_lifetime_addtime = tv.tv_sec; + newsav->lft_c->sadb_lifetime_usetime = 0; + + if (mhp->extlen[SADB_EXT_LIFETIME_HARD] < sizeof(*lft0)) { + ipseclog((LOG_DEBUG, "key_newsa: invalid hard lifetime ext len.\n")); + key_delsav(newsav); + *errp = EINVAL; + return NULL; + } + newsav->lft_h = (struct sadb_lifetime *)key_newbuf(lft0, sizeof(*lft0)); + if (newsav->lft_h == NULL) { + ipseclog((LOG_DEBUG, "key_newsa: No more memory.\n")); + key_delsav(newsav); + *errp = ENOBUFS; + return NULL; + } + } } /* reset created */ - { - struct timeval tv; - microtime(&tv); - newsav->created = tv.tv_sec; - } + { + struct timeval tv; + microtime(&tv); + newsav->created = tv.tv_sec; + } newsav->pid = mhp->msg->sadb_msg_pid; @@ -3255,8 +4089,9 @@ key_newsav( newsav->refcnt = 1; newsav->state = SADB_SASTATE_LARVAL; LIST_INSERT_TAIL(&sah->savtree[SADB_SASTATE_LARVAL], newsav, - secasvar, chain); + secasvar, chain); ipsec_sav_count++; + ipsec_monitor_sleep_wake(); return newsav; } @@ -3273,30 +4108,31 @@ key_newsav( */ 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) + 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); - + + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); + /* sanity check */ - if (sah == NULL) + 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); @@ -3311,61 +4147,77 @@ key_newsav2(struct secashead *sah, #if IPSEC_DOSEQCHECK /* sync sequence number */ - if (seq == 0) + if (seq == 0) { newsav->seq = (acq_seq = (acq_seq == ~0 ? 1 : ++acq_seq)); - else + } else #endif - newsav->seq = seq; + 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)) { - if (newsav->spihash.le_prev || newsav->spihash.le_next) - LIST_REMOVE(newsav, spihash); - KFREE(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); + secasvar, chain); } else { newsav->state = SADB_SASTATE_LARVAL; LIST_INSERT_TAIL(&sah->savtree[SADB_SASTATE_LARVAL], newsav, - secasvar, chain); + secasvar, chain); } ipsec_sav_count++; - + return newsav; } +static int +key_migratesav(struct secasvar *sav, + struct secashead *newsah) +{ + if (sav == NULL || newsah == NULL || sav->state != SADB_SASTATE_MATURE) { + return EINVAL; + } + + /* remove from SA header */ + if (__LIST_CHAINED(sav)) { + LIST_REMOVE(sav, chain); + } + + sav->sah = newsah; + LIST_INSERT_TAIL(&newsah->savtree[SADB_SASTATE_MATURE], sav, secasvar, chain); + return 0; +} + /* * free() SA variable entry. */ @@ -3373,23 +4225,25 @@ void key_delsav( struct secasvar *sav) { + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED); - /* sanity check */ - if (sav == NULL) + if (sav == NULL) { panic("key_delsav: NULL pointer is passed.\n"); + } - if (sav->refcnt > 0) - return; /* can't free */ - + if (sav->refcnt > 0) { + return; /* can't free */ + } /* remove from SA header */ - if (__LIST_CHAINED(sav)) + if (__LIST_CHAINED(sav)) { LIST_REMOVE(sav, chain); - ipsec_sav_count--; - - if (sav->spihash.le_prev || sav->spihash.le_next) + ipsec_sav_count--; + } + + if (sav->spihash.le_prev || sav->spihash.le_next) { LIST_REMOVE(sav, spihash); + } if (sav->key_auth != NULL) { bzero(_KEYBUF(sav->key_auth), _KEYLEN(sav->key_auth)); @@ -3406,9 +4260,12 @@ key_delsav( KFREE(sav->sched); sav->sched = NULL; } - if (sav->replay != NULL) { - keydb_delsecreplay(sav->replay); - sav->replay = NULL; + + 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->lft_c != NULL) { KFREE(sav->lft_c); @@ -3439,34 +4296,35 @@ key_delsav( * others : found, pointer to a SA. */ static struct secashead * -key_getsah( - struct secasindex *saidx) +key_getsah(struct secasindex *saidx) { struct secashead *sah; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED); + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); LIST_FOREACH(sah, &sahtree, chain) { - if (sah->state == SADB_SASTATE_DEAD) + if (sah->state == SADB_SASTATE_DEAD) { continue; - if (key_cmpsaidx(&sah->saidx, saidx, CMP_REQID)) + } + if (key_cmpsaidx(&sah->saidx, saidx, CMP_REQID)) { return sah; + } } return NULL; } struct secashead * -key_newsah2 (struct secasindex *saidx, - u_int8_t dir) +key_newsah2(struct secasindex *saidx, + u_int8_t dir) { struct secashead *sah; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED); + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); sah = key_getsah(saidx); if (!sah) { - return(key_newsah(saidx, dir)); + return key_newsah(saidx, NULL, 0, dir); } return sah; } @@ -3485,8 +4343,8 @@ key_checkspidup( { struct secasvar *sav; u_int stateidx, state; - - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED); + + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); /* check address family */ if (saidx->src.ss_family != saidx->dst.ss_family) { @@ -3496,15 +4354,17 @@ key_checkspidup( /* check all SAD */ LIST_FOREACH(sav, &spihash[SPIHASH(spi)], spihash) { - if (sav->spi != spi) + if (sav->spi != spi) { continue; + } for (stateidx = 0; - stateidx < _ARRAYLEN(saorder_state_alive); - stateidx++) { + stateidx < _ARRAYLEN(saorder_state_alive); + stateidx++) { state = saorder_state_alive[stateidx]; if (sav->state == state && - key_ismyaddr((struct sockaddr *)&sav->sah->saidx.dst)) + key_ismyaddr((struct sockaddr *)&sav->sah->saidx.dst)) { return sav; + } } } @@ -3516,10 +4376,11 @@ key_setspi( struct secasvar *sav, u_int32_t spi) { - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED); + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); sav->spi = spi; - if (sav->spihash.le_prev || sav->spihash.le_next) + if (sav->spihash.le_prev || sav->spihash.le_next) { LIST_REMOVE(sav, spihash); + } LIST_INSERT_HEAD(&spihash[SPIHASH(spi)], sav, spihash); } @@ -3537,15 +4398,17 @@ key_getsavbyspi( { struct secasvar *sav, *match; u_int stateidx, state, matchidx; - - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED); + + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); match = NULL; matchidx = _ARRAYLEN(saorder_state_alive); LIST_FOREACH(sav, &spihash[SPIHASH(spi)], spihash) { - if (sav->spi != spi) + if (sav->spi != spi) { continue; - if (sav->sah != sah) + } + if (sav->sah != sah) { continue; + } for (stateidx = 0; stateidx < matchidx; stateidx++) { state = saorder_state_alive[stateidx]; if (sav->state == state) { @@ -3579,14 +4442,17 @@ key_setsaval( int error = 0; struct timeval tv; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED); + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); /* sanity check */ - if (m == NULL || mhp == NULL || mhp->msg == NULL) + if (m == NULL || mhp == NULL || mhp->msg == NULL) { panic("key_setsaval: NULL pointer is passed.\n"); + } /* initialization */ - sav->replay = NULL; + for (int i = 0; i < MAX_REPLAY_WINDOWS; i++) { + sav->replay[i] = NULL; + } sav->key_auth = NULL; sav->key_enc = NULL; sav->sched = NULL; @@ -3613,38 +4479,60 @@ key_setsaval( sav->alg_auth = sa0->sadb_sa_auth; sav->alg_enc = sa0->sadb_sa_encrypt; sav->flags = sa0->sadb_sa_flags; - + /* * Verify that a nat-traversal port was specified if * the nat-traversal flag is set. */ if ((sav->flags & SADB_X_EXT_NATT) != 0) { if (mhp->extlen[SADB_EXT_SA] < sizeof(struct sadb_sa_2) || - ((const struct sadb_sa_2*)(sa0))->sadb_sa_natt_port == 0) { + ((const struct sadb_sa_2*)(sa0))->sadb_sa_natt_port == 0) { ipseclog((LOG_DEBUG, "key_setsaval: natt port not set.\n")); error = EINVAL; goto fail; } + sav->natt_encapsulated_src_port = ((const struct sadb_sa_2*)(sa0))->sadb_sa_natt_src_port; sav->remote_ike_port = ((const struct sadb_sa_2*)(sa0))->sadb_sa_natt_port; + sav->natt_interval = ((const struct sadb_sa_2*)(sa0))->sadb_sa_natt_interval; + sav->natt_offload_interval = ((const struct sadb_sa_2*)(sa0))->sadb_sa_natt_offload_interval; } - + /* * 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 + * 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_MULTIPLEUSERS) != 0) { if ((sav->flags & SADB_X_EXT_NATT) == 0 || - (sav->flags & SADB_X_EXT_NATT_KEEPALIVE) != 0) + (sav->flags & SADB_X_EXT_NATT_KEEPALIVE) != 0) { sav->flags &= ~SADB_X_EXT_NATT_MULTIPLEUSERS; + } + } /* replay window */ if ((sa0->sadb_sa_flags & SADB_X_EXT_OLD) == 0) { - sav->replay = keydb_newsecreplay(sa0->sadb_sa_replay); - if (sav->replay == NULL) { - ipseclog((LOG_DEBUG, "key_setsaval: No more memory.\n")); - error = ENOBUFS; - goto fail; + 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(sa0->sadb_sa_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(sa0->sadb_sa_replay); + if (sav->replay[0] == NULL) { + ipseclog((LOG_DEBUG, "key_setsaval: No more memory.\n")); + error = ENOBUFS; + goto fail; + } + sav->replay[0]->lastseq = ~0; } } } @@ -3667,10 +4555,10 @@ key_setsaval( case SADB_SATYPE_AH: case SADB_SATYPE_ESP: if (len == PFKEY_ALIGN8(sizeof(struct sadb_key)) && - sav->alg_auth != SADB_X_AALG_NULL) + sav->alg_auth != SADB_X_AALG_NULL) { error = EINVAL; + } break; - case SADB_X_SATYPE_IPCOMP: default: error = EINVAL; break; @@ -3706,7 +4594,7 @@ key_setsaval( case SADB_SATYPE_ESP: if (len == PFKEY_ALIGN8(sizeof(struct sadb_key)) && sav->alg_enc != SADB_EALG_NULL) { - ipseclog((LOG_DEBUG, "key_setsaval: invalid ESP algorithm.\n")); + ipseclog((LOG_DEBUG, "key_setsaval: invalid ESP algorithm.\n")); error = EINVAL; break; } @@ -3717,11 +4605,6 @@ key_setsaval( goto fail; } break; - case SADB_X_SATYPE_IPCOMP: - if (len != PFKEY_ALIGN8(sizeof(struct sadb_key))) - error = EINVAL; - sav->key_enc = NULL; /*just in case*/ - break; case SADB_SATYPE_AH: default: error = EINVAL; @@ -3740,10 +4623,12 @@ key_setsaval( case SADB_SATYPE_ESP: #if IPSEC_ESP algo = esp_algorithm_lookup(sav->alg_enc); - if (algo && algo->ivlen) + if (algo && algo->ivlen) { sav->ivlen = (*algo->ivlen)(algo, sav); - if (sav->ivlen == 0) + } + if (sav->ivlen == 0) { break; + } KMALLOC_NOWAIT(sav->iv, caddr_t, sav->ivlen); if (sav->iv == 0) { lck_mtx_unlock(sadb_mutex); @@ -3757,11 +4642,14 @@ key_setsaval( } /* initialize */ - key_randomfill(sav->iv, sav->ivlen); + if (sav->alg_enc == SADB_X_EALG_AES_GCM) { + bzero(sav->iv, sav->ivlen); + } else { + key_randomfill(sav->iv, sav->ivlen); + } #endif break; case SADB_SATYPE_AH: - case SADB_X_SATYPE_IPCOMP: break; default: ipseclog((LOG_DEBUG, "key_setsaval: invalid SA type.\n")); @@ -3779,8 +4667,8 @@ key_setsaval( 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); + 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; @@ -3799,53 +4687,55 @@ key_setsaval( sav->lft_c->sadb_lifetime_usetime = 0; /* lifetimes for HARD and SOFT */ - { - const struct sadb_lifetime *lft0; - - lft0 = (struct sadb_lifetime *) - (void *)mhp->ext[SADB_EXT_LIFETIME_HARD]; - if (lft0 != NULL) { - if (mhp->extlen[SADB_EXT_LIFETIME_HARD] < sizeof(*lft0)) { - ipseclog((LOG_DEBUG, "key_setsaval: invalid hard lifetime ext len.\n")); - error = EINVAL; - goto fail; - } - sav->lft_h = (struct sadb_lifetime *)key_newbuf(lft0, - sizeof(*lft0)); - if (sav->lft_h == NULL) { - ipseclog((LOG_DEBUG, "key_setsaval: No more memory.\n")); - error = ENOBUFS; - goto fail; - } - /* to be initialize ? */ - } + { + const struct sadb_lifetime *lft0; - lft0 = (struct sadb_lifetime *) - (void *)mhp->ext[SADB_EXT_LIFETIME_SOFT]; - if (lft0 != NULL) { - if (mhp->extlen[SADB_EXT_LIFETIME_SOFT] < sizeof(*lft0)) { - ipseclog((LOG_DEBUG, "key_setsaval: invalid soft lifetime ext len.\n")); - error = EINVAL; - goto fail; + lft0 = (struct sadb_lifetime *) + (void *)mhp->ext[SADB_EXT_LIFETIME_HARD]; + if (lft0 != NULL) { + if (mhp->extlen[SADB_EXT_LIFETIME_HARD] < sizeof(*lft0)) { + ipseclog((LOG_DEBUG, "key_setsaval: invalid hard lifetime ext len.\n")); + error = EINVAL; + goto fail; + } + sav->lft_h = (struct sadb_lifetime *)key_newbuf(lft0, + sizeof(*lft0)); + if (sav->lft_h == NULL) { + ipseclog((LOG_DEBUG, "key_setsaval: No more memory.\n")); + error = ENOBUFS; + goto fail; + } + /* to be initialize ? */ } - sav->lft_s = (struct sadb_lifetime *)key_newbuf(lft0, - sizeof(*lft0)); - if (sav->lft_s == NULL) { - ipseclog((LOG_DEBUG, "key_setsaval: No more memory.\n")); - error = ENOBUFS; - goto fail; + + lft0 = (struct sadb_lifetime *) + (void *)mhp->ext[SADB_EXT_LIFETIME_SOFT]; + if (lft0 != NULL) { + if (mhp->extlen[SADB_EXT_LIFETIME_SOFT] < sizeof(*lft0)) { + ipseclog((LOG_DEBUG, "key_setsaval: invalid soft lifetime ext len.\n")); + error = EINVAL; + goto fail; + } + sav->lft_s = (struct sadb_lifetime *)key_newbuf(lft0, + sizeof(*lft0)); + if (sav->lft_s == NULL) { + ipseclog((LOG_DEBUG, "key_setsaval: No more memory.\n")); + error = ENOBUFS; + goto fail; + } + /* to be initialize ? */ } - /* to be initialize ? */ } - } return 0; - fail: +fail: /* initialization */ - if (sav->replay != NULL) { - keydb_delsecreplay(sav->replay); - sav->replay = NULL; + 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)); @@ -3892,21 +4782,21 @@ key_setsaval( */ 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) + 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; @@ -3914,10 +4804,13 @@ key_setsaval2(struct secasvar *sav, int error = 0; struct timeval tv; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED); + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); /* initialization */ - sav->replay = NULL; + for (int i = 0; i < MAX_REPLAY_WINDOWS; i++) { + sav->replay[i] = NULL; + } + sav->key_auth = NULL; sav->key_enc = NULL; sav->sched = NULL; @@ -3952,24 +4845,43 @@ key_setsaval2(struct secasvar *sav, /* * 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 + * 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_MULTIPLEUSERS) != 0) { if ((sav->flags & SADB_X_EXT_NATT) == 0 || - (sav->flags & SADB_X_EXT_NATT_KEEPALIVE) != 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) { - sav->replay = keydb_newsecreplay(replay); - if (sav->replay == NULL) { - ipseclog((LOG_DEBUG, "key_setsaval: No more memory.\n")); - error = ENOBUFS; - goto fail; + 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) { @@ -3977,7 +4889,7 @@ key_setsaval2(struct secasvar *sav, 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) { @@ -3985,15 +4897,16 @@ key_setsaval2(struct secasvar *sav, 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) + 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) { @@ -4007,7 +4920,11 @@ key_setsaval2(struct secasvar *sav, } } /* initialize */ - key_randomfill(sav->iv, sav->ivlen); + if (sav->alg_enc == SADB_X_EALG_AES_GCM) { + bzero(sav->iv, sav->ivlen); + } else { + key_randomfill(sav->iv, sav->ivlen); + } } #endif } @@ -4015,55 +4932,57 @@ key_setsaval2(struct secasvar *sav, /* 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)); + 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); + 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)); + 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)); + 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)); + 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 */ - if (sav->replay != NULL) { - keydb_delsecreplay(sav->replay); - sav->replay = NULL; + 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)); @@ -4096,7 +5015,7 @@ fail: KFREE(sav->lft_s); sav->lft_s = NULL; } - + return error; } @@ -4110,12 +5029,12 @@ key_mature( struct secasvar *sav) { int mature; - int checkmask = 0; /* 2^0: ealg 2^1: aalg 2^2: calg */ - int mustmask = 0; /* 2^0: ealg 2^1: aalg 2^2: calg */ + int checkmask = 0; /* 2^0: ealg 2^1: aalg 2^2: calg */ + int mustmask = 0; /* 2^0: ealg 2^1: aalg 2^2: calg */ mature = 0; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED); + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); /* check SPI value */ switch (sav->sah->saidx.proto) { @@ -4137,15 +5056,16 @@ key_mature( case IPPROTO_ESP: /* check flags */ if ((sav->flags & SADB_X_EXT_OLD) - && (sav->flags & SADB_X_EXT_DERIV)) { + && (sav->flags & SADB_X_EXT_DERIV)) { ipseclog((LOG_DEBUG, "key_mature: " "invalid flag (derived) given to old-esp.\n")); return EINVAL; } - if (sav->alg_auth == SADB_AALG_NONE) + if (sav->alg_auth == SADB_AALG_NONE) { checkmask = 1; - else + } else { checkmask = 3; + } mustmask = 1; break; case IPPROTO_AH: @@ -4158,25 +5078,11 @@ key_mature( if (sav->alg_enc != SADB_EALG_NONE) { ipseclog((LOG_DEBUG, "key_mature: " "protocol and algorithm mismated.\n")); - return(EINVAL); + return EINVAL; } checkmask = 2; mustmask = 2; break; - case IPPROTO_IPCOMP: - if (sav->alg_auth != SADB_AALG_NONE) { - ipseclog((LOG_DEBUG, "key_mature: " - "protocol and algorithm mismated.\n")); - return(EINVAL); - } - if ((sav->flags & SADB_X_EXT_RAWCPI) == 0 - && ntohl(sav->spi) >= 0x10000) { - ipseclog((LOG_DEBUG, "key_mature: invalid cpi for IPComp.\n")); - return(EINVAL); - } - checkmask = 4; - mustmask = 4; - break; default: ipseclog((LOG_DEBUG, "key_mature: Invalid satype.\n")); return EPROTONOSUPPORT; @@ -4189,16 +5095,17 @@ key_mature( algo = ah_algorithm_lookup(sav->alg_auth); if (!algo) { - ipseclog((LOG_DEBUG,"key_mature: " + ipseclog((LOG_DEBUG, "key_mature: " "unknown authentication algorithm.\n")); return EINVAL; } /* algorithm-dependent check */ - if (sav->key_auth) + if (sav->key_auth) { keylen = sav->key_auth->sadb_key_bits; - else + } else { keylen = 0; + } if (keylen < algo->keymin || algo->keymax < keylen) { ipseclog((LOG_DEBUG, "key_mature: invalid AH key length %d " @@ -4211,11 +5118,12 @@ key_mature( if ((*algo->mature)(sav)) { /* message generated in per-algorithm function*/ return EINVAL; - } else + } else { mature = SADB_SATYPE_AH; + } } - if ((mustmask & 2) != 0 && mature != SADB_SATYPE_AH) { + if ((mustmask & 2) != 0 && mature != SADB_SATYPE_AH) { ipseclog((LOG_DEBUG, "key_mature: no satisfy algorithm for AH\n")); return EINVAL; } @@ -4234,10 +5142,11 @@ key_mature( } /* algorithm-dependent check */ - if (sav->key_enc) + if (sav->key_enc) { keylen = sav->key_enc->sadb_key_bits; - else + } else { keylen = 0; + } if (keylen < algo->keymin || algo->keymax < keylen) { ipseclog((LOG_DEBUG, "key_mature: invalid ESP key length %d " @@ -4250,11 +5159,12 @@ key_mature( if ((*algo->mature)(sav)) { /* message generated in per-algorithm function*/ return EINVAL; - } else + } else { mature = SADB_SATYPE_ESP; + } } - if ((mustmask & 1) != 0 && mature != SADB_SATYPE_ESP) { + if ((mustmask & 1) != 0 && mature != SADB_SATYPE_ESP) { ipseclog((LOG_DEBUG, "key_mature: no satisfy algorithm for ESP\n")); return EINVAL; } @@ -4264,18 +5174,6 @@ key_mature( #endif } - /* check compression algorithm */ - if ((checkmask & 4) != 0) { - const struct ipcomp_algorithm *algo; - - /* algorithm-dependent check */ - algo = ipcomp_algorithm_lookup(sav->alg_enc); - if (!algo) { - ipseclog((LOG_DEBUG, "key_mature: unknown compression algorithm.\n")); - return EINVAL; - } - } - key_sa_chgstate(sav, SADB_SASTATE_MATURE); return 0; @@ -4304,77 +5202,88 @@ key_setdumpsa( SADB_EXT_KEY_ENCRYPT, SADB_EXT_IDENTITY_SRC, SADB_EXT_IDENTITY_DST, SADB_EXT_SENSITIVITY, }; - + m = key_setsadbmsg(type, 0, satype, seq, pid, sav->refcnt); - if (m == NULL) + if (m == NULL) { goto fail; + } result = m; - for (i = sizeof(dumporder)/sizeof(dumporder[0]) - 1; i >= 0; i--) { + for (i = sizeof(dumporder) / sizeof(dumporder[0]) - 1; i >= 0; i--) { m = NULL; p = NULL; switch (dumporder[i]) { case SADB_EXT_SA: m = key_setsadbsa(sav); - if (!m) + if (!m) { goto fail; + } break; case SADB_X_EXT_SA2: m = key_setsadbxsa2(sav->sah->saidx.mode, - sav->replay ? sav->replay->count : 0, - sav->sah->saidx.reqid); - if (!m) + sav->replay[0] ? sav->replay[0]->count : 0, + sav->sah->saidx.reqid, + sav->flags2); + if (!m) { goto fail; + } break; case SADB_EXT_ADDRESS_SRC: m = key_setsadbaddr(SADB_EXT_ADDRESS_SRC, (struct sockaddr *)&sav->sah->saidx.src, FULLMASK, IPSEC_ULPROTO_ANY); - if (!m) + if (!m) { goto fail; + } break; case SADB_EXT_ADDRESS_DST: m = key_setsadbaddr(SADB_EXT_ADDRESS_DST, (struct sockaddr *)&sav->sah->saidx.dst, FULLMASK, IPSEC_ULPROTO_ANY); - if (!m) + if (!m) { goto fail; + } break; case SADB_EXT_KEY_AUTH: - if (!sav->key_auth) + if (!sav->key_auth) { continue; + } l = PFKEY_UNUNIT64(sav->key_auth->sadb_key_len); p = sav->key_auth; break; case SADB_EXT_KEY_ENCRYPT: - if (!sav->key_enc) + if (!sav->key_enc) { continue; + } l = PFKEY_UNUNIT64(sav->key_enc->sadb_key_len); p = sav->key_enc; break; case SADB_EXT_LIFETIME_CURRENT: - if (!sav->lft_c) + if (!sav->lft_c) { continue; + } l = PFKEY_UNUNIT64(((struct sadb_ext *)sav->lft_c)->sadb_ext_len); p = sav->lft_c; break; case SADB_EXT_LIFETIME_HARD: - if (!sav->lft_h) + if (!sav->lft_h) { continue; + } l = PFKEY_UNUNIT64(((struct sadb_ext *)sav->lft_h)->sadb_ext_len); p = sav->lft_h; break; case SADB_EXT_LIFETIME_SOFT: - if (!sav->lft_s) + if (!sav->lft_s) { continue; + } l = PFKEY_UNUNIT64(((struct sadb_ext *)sav->lft_s)->sadb_ext_len); p = sav->lft_s; break; @@ -4382,44 +5291,58 @@ key_setdumpsa( case SADB_EXT_ADDRESS_PROXY: case SADB_EXT_IDENTITY_SRC: case SADB_EXT_IDENTITY_DST: - /* XXX: should we brought from SPD ? */ + /* XXX: should we brought from SPD ? */ case SADB_EXT_SENSITIVITY: default: continue; } - if ((!m && !p) || (m && p)) + if ((!m && !p) || (m && p)) { goto fail; + } if (p && tres) { - M_PREPEND(tres, l, M_WAITOK); - if (!tres) + M_PREPEND(tres, l, M_WAITOK, 1); + if (!tres) { goto fail; + } bcopy(p, mtod(tres, caddr_t), l); continue; } if (p) { m = key_alloc_mbuf(l); - if (!m) + if (!m) { goto fail; + } m_copyback(m, 0, l, p); } - if (tres) + if (tres) { m_cat(m, tres); + } tres = m; } m_cat(result, tres); + if (sav->sah && (sav->sah->outgoing_if || sav->sah->ipsec_if)) { + m = key_setsadbipsecif(NULL, ifindex2ifnet[sav->sah->outgoing_if], sav->sah->ipsec_if, 0); + if (!m) { + goto fail; + } + m_cat(result, m); + } + if (result->m_len < sizeof(struct sadb_msg)) { result = m_pullup(result, sizeof(struct sadb_msg)); - if (result == NULL) + if (result == NULL) { goto fail; + } } result->m_pkthdr.len = 0; - for (m = result; m; m = m->m_next) + for (m = result; m; m = m->m_next) { result->m_pkthdr.len += m->m_len; + } mtod(result, struct sadb_msg *)->sadb_msg_len = PFKEY_UNIT64(result->m_pkthdr.len); @@ -4449,8 +5372,9 @@ key_setsadbmsg( int len; len = PFKEY_ALIGN8(sizeof(struct sadb_msg)); - if (len > MCLBYTES) + if (len > MCLBYTES) { return NULL; + } MGETHDR(m, M_DONTWAIT, MT_DATA); if (m && len > MHLEN) { MCLGET(m, M_DONTWAIT); @@ -4459,8 +5383,9 @@ key_setsadbmsg( m = NULL; } } - if (!m) + if (!m) { return NULL; + } m->m_pkthdr.len = m->m_len = len; m->m_next = NULL; @@ -4492,9 +5417,10 @@ key_setsadbsa( len = PFKEY_ALIGN8(sizeof(struct sadb_sa)); m = key_alloc_mbuf(len); - if (!m || m->m_next) { /*XXX*/ - if (m) + if (!m || m->m_next) { /*XXX*/ + if (m) { m_freem(m); + } return NULL; } @@ -4504,7 +5430,7 @@ key_setsadbsa( p->sadb_sa_len = PFKEY_UNIT64(len); p->sadb_sa_exttype = SADB_EXT_SA; p->sadb_sa_spi = sav->spi; - p->sadb_sa_replay = (sav->replay != NULL ? sav->replay->wsize : 0); + p->sadb_sa_replay = (sav->replay[0] != NULL ? sav->replay[0]->wsize : 0); p->sadb_sa_state = sav->state; p->sadb_sa_auth = sav->alg_auth; p->sadb_sa_encrypt = sav->alg_enc; @@ -4530,9 +5456,10 @@ key_setsadbaddr( len = PFKEY_ALIGN8(sizeof(struct sadb_address)) + PFKEY_ALIGN8(saddr->sa_len); m = key_alloc_mbuf(len); - if (!m || m->m_next) { /*XXX*/ - if (m) + if (!m || m->m_next) { /*XXX*/ + if (m) { m_freem(m); + } return NULL; } @@ -4551,7 +5478,7 @@ key_setsadbaddr( prefixlen = sizeof(struct in6_addr) << 3; break; default: - ; /*XXX*/ + ; /*XXX*/ } } p->sadb_address_prefixlen = prefixlen; @@ -4564,11 +5491,51 @@ key_setsadbaddr( return m; } +static struct mbuf * +key_setsadbipsecif(ifnet_t internal_if, + ifnet_t outgoing_if, + ifnet_t ipsec_if, + int init_disabled) +{ + struct mbuf *m; + struct sadb_x_ipsecif *p; + size_t len; + + len = PFKEY_ALIGN8(sizeof(struct sadb_x_ipsecif)); + m = key_alloc_mbuf(len); + if (!m || m->m_next) { /*XXX*/ + if (m) { + m_freem(m); + } + return NULL; + } + + p = mtod(m, struct sadb_x_ipsecif *); + + bzero(p, len); + p->sadb_x_ipsecif_len = PFKEY_UNIT64(len); + p->sadb_x_ipsecif_exttype = SADB_X_EXT_IPSECIF; + + if (internal_if && internal_if->if_xname) { + strlcpy(p->sadb_x_ipsecif_internal_if, internal_if->if_xname, IFXNAMSIZ); + } + if (outgoing_if && outgoing_if->if_xname) { + strlcpy(p->sadb_x_ipsecif_outgoing_if, outgoing_if->if_xname, IFXNAMSIZ); + } + if (ipsec_if && ipsec_if->if_xname) { + strlcpy(p->sadb_x_ipsecif_ipsec_if, ipsec_if->if_xname, IFXNAMSIZ); + } + + p->sadb_x_ipsecif_init_disabled = init_disabled; + + return m; +} + /* * set data into sadb_session_id */ static struct mbuf * -key_setsadbsession_id (u_int64_t session_ids[]) +key_setsadbsession_id(u_int64_t session_ids[]) { struct mbuf *m; struct sadb_session_id *p; @@ -4576,9 +5543,10 @@ key_setsadbsession_id (u_int64_t session_ids[]) len = PFKEY_ALIGN8(sizeof(*p)); m = key_alloc_mbuf(len); - if (!m || m->m_next) { /*XXX*/ - if (m) + if (!m || m->m_next) { /*XXX*/ + if (m) { m_freem(m); + } return NULL; } @@ -4597,24 +5565,25 @@ key_setsadbsession_id (u_int64_t session_ids[]) * copy stats data into sadb_sastat type. */ static struct mbuf * -key_setsadbsastat (u_int32_t dir, - struct sastat *stats, - u_int32_t max_stats) +key_setsadbsastat(u_int32_t dir, + struct sastat *stats, + u_int32_t max_stats) { struct mbuf *m; struct sadb_sastat *p; int list_len, len; if (!stats) { - return NULL; + 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) + if (!m || m->m_next) { /*XXX*/ + if (m) { m_freem(m); + } return NULL; } @@ -4626,9 +5595,9 @@ key_setsadbsastat (u_int32_t dir, 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); + bcopy(stats, + mtod(m, caddr_t) + PFKEY_ALIGN8(sizeof(*p)), + list_len); } return m; @@ -4652,9 +5621,10 @@ key_setsadbident( len = PFKEY_ALIGN8(sizeof(struct sadb_ident)) + PFKEY_ALIGN8(stringlen); m = key_alloc_mbuf(len); - if (!m || m->m_next) { /*XXX*/ - if (m) + if (!m || m->m_next) { /*XXX*/ + if (m) { m_freem(m); + } return NULL; } @@ -4682,7 +5652,8 @@ static struct mbuf * key_setsadbxsa2( u_int8_t mode, u_int32_t seq, - u_int32_t reqid) + u_int32_t reqid, + u_int16_t flags) { struct mbuf *m; struct sadb_x_sa2 *p; @@ -4690,9 +5661,10 @@ key_setsadbxsa2( len = PFKEY_ALIGN8(sizeof(struct sadb_x_sa2)); m = key_alloc_mbuf(len); - if (!m || m->m_next) { /*XXX*/ - if (m) + if (!m || m->m_next) { /*XXX*/ + if (m) { m_freem(m); + } return NULL; } @@ -4706,6 +5678,7 @@ key_setsadbxsa2( p->sadb_x_sa2_reserved2 = 0; p->sadb_x_sa2_sequence = seq; p->sadb_x_sa2_reqid = reqid; + p->sadb_x_sa2_flags = flags; return m; } @@ -4725,9 +5698,10 @@ key_setsadbxpolicy( len = PFKEY_ALIGN8(sizeof(struct sadb_x_policy)); m = key_alloc_mbuf(len); - if (!m || m->m_next) { /*XXX*/ - if (m) + if (!m || m->m_next) { /*XXX*/ + if (m) { m_freem(m); + } return NULL; } @@ -4754,7 +5728,7 @@ key_newbuf( { caddr_t new; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED); + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); KMALLOC_NOWAIT(new, caddr_t, len); if (new == NULL) { lck_mtx_unlock(sadb_mutex); @@ -4784,8 +5758,9 @@ key_ismyaddr( #endif /* sanity check */ - if (sa == NULL) + if (sa == NULL) { panic("key_ismyaddr: NULL pointer is passed.\n"); + } switch (sa->sa_family) { #if INET @@ -4793,12 +5768,11 @@ key_ismyaddr( lck_rw_lock_shared(in_ifaddr_rwlock); sin = (struct sockaddr_in *)(void *)sa; for (ia = in_ifaddrhead.tqh_first; ia; - ia = ia->ia_link.tqe_next) { + ia = ia->ia_link.tqe_next) { IFA_LOCK_SPIN(&ia->ia_ifa); if (sin->sin_family == ia->ia_addr.sin_family && sin->sin_len == ia->ia_addr.sin_len && - sin->sin_addr.s_addr == ia->ia_addr.sin_addr.s_addr) - { + sin->sin_addr.s_addr == ia->ia_addr.sin_addr.s_addr) { IFA_UNLOCK(&ia->ia_ifa); lck_rw_done(in_ifaddr_rwlock); return 1; @@ -4863,8 +5837,9 @@ key_ismyaddr6( lck_rw_done(&in6_ifaddr_rwlock); /* loopback, just for safety */ - if (IN6_IS_ADDR_LOOPBACK(&sin6->sin6_addr)) + if (IN6_IS_ADDR_LOOPBACK(&sin6->sin6_addr)) { return 1; + } return 0; } @@ -4875,10 +5850,10 @@ key_ismyaddr6( * flag can specify to compare 2 saidxes. * compare two secasindex structure without both mode and reqid. * don't compare port. - * IN: + * IN: * saidx0: source, it can be in SAD. * saidx1: object. - * OUT: + * OUT: * 1 : equal * 0 : not equal */ @@ -4889,47 +5864,58 @@ key_cmpsaidx( int flag) { /* sanity */ - if (saidx0 == NULL && saidx1 == NULL) + if (saidx0 == NULL && saidx1 == NULL) { return 1; + } + + if (saidx0 == NULL || saidx1 == NULL) { + return 0; + } - if (saidx0 == NULL || saidx1 == NULL) + if (saidx0->ipsec_ifindex != 0 && saidx0->ipsec_ifindex != saidx1->ipsec_ifindex) { return 0; + } - if (saidx0->proto != saidx1->proto) + if (saidx0->proto != saidx1->proto) { return 0; + } if (flag == CMP_EXACTLY) { - if (saidx0->mode != saidx1->mode) + if (saidx0->mode != saidx1->mode) { return 0; - if (saidx0->reqid != saidx1->reqid) + } + if (saidx0->reqid != saidx1->reqid) { return 0; + } if (bcmp(&saidx0->src, &saidx1->src, saidx0->src.ss_len) != 0 || - bcmp(&saidx0->dst, &saidx1->dst, saidx0->dst.ss_len) != 0) + bcmp(&saidx0->dst, &saidx1->dst, saidx0->dst.ss_len) != 0) { return 0; + } } else { - /* CMP_MODE_REQID, CMP_REQID, CMP_HEAD */ if (flag & CMP_REQID) { /* * If reqid of SPD is non-zero, unique SA is required. * The result must be of same reqid in this case. */ - if (saidx1->reqid != 0 && saidx0->reqid != saidx1->reqid) + if (saidx1->reqid != 0 && saidx0->reqid != saidx1->reqid) { return 0; + } } if (flag & CMP_MODE) { if (saidx0->mode != IPSEC_MODE_ANY - && saidx0->mode != saidx1->mode) + && saidx0->mode != saidx1->mode) { return 0; + } } if (key_sockaddrcmp((struct sockaddr *)&saidx0->src, - (struct sockaddr *)&saidx1->src, flag & CMP_PORT ? 1 : 0) != 0) { + (struct sockaddr *)&saidx1->src, flag & CMP_PORT ? 1 : 0) != 0) { return 0; } if (key_sockaddrcmp((struct sockaddr *)&saidx0->dst, - (struct sockaddr *)&saidx1->dst, flag & CMP_PORT ? 1 : 0) != 0) { + (struct sockaddr *)&saidx1->dst, flag & CMP_PORT ? 1 : 0) != 0) { return 0; } } @@ -4952,16 +5938,20 @@ key_cmpspidx_exactly( struct secpolicyindex *spidx1) { /* sanity */ - if (spidx0 == NULL && spidx1 == NULL) + if (spidx0 == NULL && spidx1 == NULL) { return 1; + } - if (spidx0 == NULL || spidx1 == NULL) + if (spidx0 == NULL || spidx1 == NULL) { return 0; + } if (spidx0->prefs != spidx1->prefs - || spidx0->prefd != spidx1->prefd - || spidx0->ul_proto != spidx1->ul_proto) + || spidx0->prefd != spidx1->prefd + || spidx0->ul_proto != spidx1->ul_proto + || spidx0->internal_if != spidx1->internal_if) { return 0; + } if (key_sockaddrcmp((struct sockaddr *)&spidx0->src, (struct sockaddr *)&spidx1->src, 1) != 0) { @@ -4972,6 +5962,23 @@ key_cmpspidx_exactly( return 0; } + if (key_sockaddrcmp((struct sockaddr *)&spidx0->src_range.start, + (struct sockaddr *)&spidx1->src_range.start, 1) != 0) { + return 0; + } + if (key_sockaddrcmp((struct sockaddr *)&spidx0->src_range.end, + (struct sockaddr *)&spidx1->src_range.end, 1) != 0) { + return 0; + } + if (key_sockaddrcmp((struct sockaddr *)&spidx0->dst_range.start, + (struct sockaddr *)&spidx1->dst_range.start, 1) != 0) { + return 0; + } + if (key_sockaddrcmp((struct sockaddr *)&spidx0->dst_range.end, + (struct sockaddr *)&spidx1->dst_range.end, 1) != 0) { + return 0; + } + return 1; } @@ -4989,92 +5996,165 @@ key_cmpspidx_withmask( struct secpolicyindex *spidx0, struct secpolicyindex *spidx1) { + int spidx0_src_is_range = 0; + int spidx0_dst_is_range = 0; + /* sanity */ - if (spidx0 == NULL && spidx1 == NULL) + if (spidx0 == NULL && spidx1 == NULL) { return 1; + } - if (spidx0 == NULL || spidx1 == NULL) + if (spidx0 == NULL || spidx1 == NULL) { return 0; + } + + if (spidx0->src_range.start.ss_len > 0) { + spidx0_src_is_range = 1; + } + + if (spidx0->dst_range.start.ss_len > 0) { + spidx0_dst_is_range = 1; + } - if (spidx0->src.ss_family != spidx1->src.ss_family || - spidx0->dst.ss_family != spidx1->dst.ss_family || - spidx0->src.ss_len != spidx1->src.ss_len || - spidx0->dst.ss_len != spidx1->dst.ss_len) + if ((spidx0_src_is_range ? spidx0->src_range.start.ss_family : spidx0->src.ss_family) != spidx1->src.ss_family || + (spidx0_dst_is_range ? spidx0->dst_range.start.ss_family : spidx0->dst.ss_family) != spidx1->dst.ss_family || + (spidx0_src_is_range ? spidx0->src_range.start.ss_len : spidx0->src.ss_len) != spidx1->src.ss_len || + (spidx0_dst_is_range ? spidx0->dst_range.start.ss_len : spidx0->dst.ss_len) != spidx1->dst.ss_len) { return 0; + } /* if spidx.ul_proto == IPSEC_ULPROTO_ANY, ignore. */ if (spidx0->ul_proto != (u_int16_t)IPSEC_ULPROTO_ANY - && spidx0->ul_proto != spidx1->ul_proto) + && spidx0->ul_proto != spidx1->ul_proto) { return 0; + } - switch (spidx0->src.ss_family) { - case AF_INET: - if (satosin(&spidx0->src)->sin_port != IPSEC_PORT_ANY - && satosin(&spidx0->src)->sin_port != - satosin(&spidx1->src)->sin_port) - return 0; - if (!key_bbcmp((caddr_t)&satosin(&spidx0->src)->sin_addr, - (caddr_t)&satosin(&spidx1->src)->sin_addr, spidx0->prefs)) - return 0; - break; - case AF_INET6: - if (satosin6(&spidx0->src)->sin6_port != IPSEC_PORT_ANY - && satosin6(&spidx0->src)->sin6_port != - satosin6(&spidx1->src)->sin6_port) - return 0; - /* - * scope_id check. if sin6_scope_id is 0, we regard it - * as a wildcard scope, which matches any scope zone ID. - */ - if (satosin6(&spidx0->src)->sin6_scope_id && - satosin6(&spidx1->src)->sin6_scope_id && - satosin6(&spidx0->src)->sin6_scope_id != - satosin6(&spidx1->src)->sin6_scope_id) + /* If spidx1 specifies interface, ignore src addr */ + if (spidx1->internal_if != NULL) { + if (spidx0->internal_if == NULL + || spidx0->internal_if != spidx1->internal_if) { return 0; - if (!key_bbcmp((caddr_t)&satosin6(&spidx0->src)->sin6_addr, - (caddr_t)&satosin6(&spidx1->src)->sin6_addr, spidx0->prefs)) - return 0; - break; - default: - /* XXX */ - if (bcmp(&spidx0->src, &spidx1->src, spidx0->src.ss_len) != 0) + } + + /* Still check ports */ + switch (spidx0->src.ss_family) { + case AF_INET: + if (spidx0_src_is_range && + (satosin(&spidx1->src)->sin_port < satosin(&spidx0->src_range.start)->sin_port + || satosin(&spidx1->src)->sin_port > satosin(&spidx0->src_range.end)->sin_port)) { + return 0; + } else if (satosin(&spidx0->src)->sin_port != IPSEC_PORT_ANY + && satosin(&spidx0->src)->sin_port != + satosin(&spidx1->src)->sin_port) { + return 0; + } + break; + case AF_INET6: + if (spidx0_src_is_range && + (satosin6(&spidx1->src)->sin6_port < satosin6(&spidx0->src_range.start)->sin6_port + || satosin6(&spidx1->src)->sin6_port > satosin6(&spidx0->src_range.end)->sin6_port)) { + return 0; + } else if (satosin6(&spidx0->src)->sin6_port != IPSEC_PORT_ANY + && satosin6(&spidx0->src)->sin6_port != + satosin6(&spidx1->src)->sin6_port) { + return 0; + } + break; + default: + break; + } + } else if (spidx0_src_is_range) { + if (!key_is_addr_in_range(&spidx1->src, &spidx0->src_range)) { return 0; - break; + } + } else { + switch (spidx0->src.ss_family) { + case AF_INET: + if (satosin(&spidx0->src)->sin_port != IPSEC_PORT_ANY + && satosin(&spidx0->src)->sin_port != + satosin(&spidx1->src)->sin_port) { + return 0; + } + if (!key_bbcmp((caddr_t)&satosin(&spidx0->src)->sin_addr, + (caddr_t)&satosin(&spidx1->src)->sin_addr, spidx0->prefs)) { + return 0; + } + break; + case AF_INET6: + if (satosin6(&spidx0->src)->sin6_port != IPSEC_PORT_ANY + && satosin6(&spidx0->src)->sin6_port != + satosin6(&spidx1->src)->sin6_port) { + return 0; + } + /* + * scope_id check. if sin6_scope_id is 0, we regard it + * as a wildcard scope, which matches any scope zone ID. + */ + if (satosin6(&spidx0->src)->sin6_scope_id && + satosin6(&spidx1->src)->sin6_scope_id && + satosin6(&spidx0->src)->sin6_scope_id != + satosin6(&spidx1->src)->sin6_scope_id) { + return 0; + } + if (!key_bbcmp((caddr_t)&satosin6(&spidx0->src)->sin6_addr, + (caddr_t)&satosin6(&spidx1->src)->sin6_addr, spidx0->prefs)) { + return 0; + } + break; + default: + /* XXX */ + if (bcmp(&spidx0->src, &spidx1->src, spidx0->src.ss_len) != 0) { + return 0; + } + break; + } } - switch (spidx0->dst.ss_family) { - case AF_INET: - if (satosin(&spidx0->dst)->sin_port != IPSEC_PORT_ANY - && satosin(&spidx0->dst)->sin_port != - satosin(&spidx1->dst)->sin_port) - return 0; - if (!key_bbcmp((caddr_t)&satosin(&spidx0->dst)->sin_addr, - (caddr_t)&satosin(&spidx1->dst)->sin_addr, spidx0->prefd)) - return 0; - break; - case AF_INET6: - if (satosin6(&spidx0->dst)->sin6_port != IPSEC_PORT_ANY - && satosin6(&spidx0->dst)->sin6_port != - satosin6(&spidx1->dst)->sin6_port) - return 0; - /* - * scope_id check. if sin6_scope_id is 0, we regard it - * as a wildcard scope, which matches any scope zone ID. - */ - if (satosin6(&spidx0->src)->sin6_scope_id && - satosin6(&spidx1->src)->sin6_scope_id && - satosin6(&spidx0->dst)->sin6_scope_id != - satosin6(&spidx1->dst)->sin6_scope_id) - return 0; - if (!key_bbcmp((caddr_t)&satosin6(&spidx0->dst)->sin6_addr, - (caddr_t)&satosin6(&spidx1->dst)->sin6_addr, spidx0->prefd)) - return 0; - break; - default: - /* XXX */ - if (bcmp(&spidx0->dst, &spidx1->dst, spidx0->dst.ss_len) != 0) + if (spidx0_dst_is_range) { + if (!key_is_addr_in_range(&spidx1->dst, &spidx0->dst_range)) { return 0; - break; + } + } else { + switch (spidx0->dst.ss_family) { + case AF_INET: + if (satosin(&spidx0->dst)->sin_port != IPSEC_PORT_ANY + && satosin(&spidx0->dst)->sin_port != + satosin(&spidx1->dst)->sin_port) { + return 0; + } + if (!key_bbcmp((caddr_t)&satosin(&spidx0->dst)->sin_addr, + (caddr_t)&satosin(&spidx1->dst)->sin_addr, spidx0->prefd)) { + return 0; + } + break; + case AF_INET6: + if (satosin6(&spidx0->dst)->sin6_port != IPSEC_PORT_ANY + && satosin6(&spidx0->dst)->sin6_port != + satosin6(&spidx1->dst)->sin6_port) { + return 0; + } + /* + * scope_id check. if sin6_scope_id is 0, we regard it + * as a wildcard scope, which matches any scope zone ID. + */ + if (satosin6(&spidx0->src)->sin6_scope_id && + satosin6(&spidx1->src)->sin6_scope_id && + satosin6(&spidx0->dst)->sin6_scope_id != + satosin6(&spidx1->dst)->sin6_scope_id) { + return 0; + } + if (!key_bbcmp((caddr_t)&satosin6(&spidx0->dst)->sin6_addr, + (caddr_t)&satosin6(&spidx1->dst)->sin6_addr, spidx0->prefd)) { + return 0; + } + break; + default: + /* XXX */ + if (bcmp(&spidx0->dst, &spidx1->dst, spidx0->dst.ss_len) != 0) { + return 0; + } + break; + } } /* XXX Do we check other field ? e.g. flowinfo */ @@ -5082,50 +6162,115 @@ key_cmpspidx_withmask( return 1; } -/* returns 0 on match */ +static int +key_is_addr_in_range(struct sockaddr_storage *addr, struct secpolicyaddrrange *addr_range) +{ + int cmp = 0; + + if (addr == NULL || addr_range == NULL) { + return 0; + } + + /* Must be greater than or equal to start */ + cmp = key_sockaddrcmp((struct sockaddr *)addr, (struct sockaddr *)&addr_range->start, 1); + if (cmp != 0 && cmp != 1) { + return 0; + } + + /* Must be less than or equal to end */ + cmp = key_sockaddrcmp((struct sockaddr *)addr, (struct sockaddr *)&addr_range->end, 1); + if (cmp != 0 && cmp != -1) { + return 0; + } + + return 1; +} + +/* + * Return values: + * -1: sa1 < sa2 + * 0: sa1 == sa2 + * 1: sa1 > sa2 + * 2: Not comparable or error + */ static int key_sockaddrcmp( struct sockaddr *sa1, struct sockaddr *sa2, int port) { - if (sa1->sa_family != sa2->sa_family || sa1->sa_len != sa2->sa_len) - return 1; + int result = 0; + int port_result = 0; + + if (sa1->sa_family != sa2->sa_family || sa1->sa_len != sa2->sa_len) { + return 2; + } + + if (sa1->sa_len == 0) { + return 0; + } switch (sa1->sa_family) { case AF_INET: - if (sa1->sa_len != sizeof(struct sockaddr_in)) - return 1; - if (satosin(sa1)->sin_addr.s_addr != - satosin(sa2)->sin_addr.s_addr) { - return 1; + if (sa1->sa_len != sizeof(struct sockaddr_in)) { + return 2; } - if (port && satosin(sa1)->sin_port != satosin(sa2)->sin_port) - return 1; + + result = memcmp(&satosin(sa1)->sin_addr.s_addr, &satosin(sa2)->sin_addr.s_addr, sizeof(satosin(sa1)->sin_addr.s_addr)); + + if (port) { + if (satosin(sa1)->sin_port < satosin(sa2)->sin_port) { + port_result = -1; + } else if (satosin(sa1)->sin_port > satosin(sa2)->sin_port) { + port_result = 1; + } + + if (result == 0) { + result = port_result; + } else if ((result > 0 && port_result < 0) || (result < 0 && port_result > 0)) { + return 2; + } + } + break; case AF_INET6: - if (sa1->sa_len != sizeof(struct sockaddr_in6)) - return 1; /*EINVAL*/ + if (sa1->sa_len != sizeof(struct sockaddr_in6)) { + return 2; /*EINVAL*/ + } if (satosin6(sa1)->sin6_scope_id != satosin6(sa2)->sin6_scope_id) { - return 1; - } - if (!IN6_ARE_ADDR_EQUAL(&satosin6(sa1)->sin6_addr, - &satosin6(sa2)->sin6_addr)) { - return 1; + return 2; } - if (port && - satosin6(sa1)->sin6_port != satosin6(sa2)->sin6_port) { - return 1; + + result = memcmp(&satosin6(sa1)->sin6_addr.s6_addr[0], &satosin6(sa2)->sin6_addr.s6_addr[0], sizeof(struct in6_addr)); + + if (port) { + if (satosin6(sa1)->sin6_port < satosin6(sa2)->sin6_port) { + port_result = -1; + } else if (satosin6(sa1)->sin6_port > satosin6(sa2)->sin6_port) { + port_result = 1; + } + + if (result == 0) { + result = port_result; + } else if ((result > 0 && port_result < 0) || (result < 0 && port_result > 0)) { + return 2; + } } + break; default: - if (bcmp(sa1, sa2, sa1->sa_len) != 0) - return 1; + result = memcmp(sa1, sa2, sa1->sa_len); break; } - return 0; + if (result < 0) { + result = -1; + } else if (result > 0) { + result = 1; + } + + return result; } /* @@ -5150,21 +6295,24 @@ key_bbcmp( * at a time, but it is complicated on LSB Endian machines */ /* Handle null pointers */ - if (p1 == NULL || p2 == NULL) - return (p1 == p2); + if (p1 == NULL || p2 == NULL) { + return p1 == p2; + } while (bits >= 8) { - if (*p1++ != *p2++) + if (*p1++ != *p2++) { return 0; + } bits -= 8; } if (bits > 0) { - mask = ~((1<<(8-bits))-1); - if ((*p1 & mask) != (*p2 & mask)) + mask = ~((1 << (8 - bits)) - 1); + if ((*p1 & mask) != (*p2 & mask)) { return 0; + } } - return 1; /* Match! */ + return 1; /* Match! */ } /* @@ -5185,7 +6333,8 @@ key_timehandler(void) struct secasvar **savexbuf = NULL, **savexptr = NULL; struct secasvar **savkabuf = NULL, **savkaptr = NULL; int spbufcount = 0, savbufcount = 0, spcount = 0, savexcount = 0, savkacount = 0, cnt; - + int stop_handler = 1; /* stop the timehandler */ + microtime(&tv); /* pre-allocate buffers before taking the lock */ @@ -5193,30 +6342,35 @@ key_timehandler(void) if ((spbufcount = ipsec_policy_count) != 0) { spbufcount += 256; KMALLOC_WAIT(spbuf, struct secpolicy **, spbufcount * sizeof(struct secpolicy *)); - if (spbuf) + if (spbuf) { spptr = spbuf; + } } if ((savbufcount = ipsec_sav_count) != 0) { savbufcount += 512; KMALLOC_WAIT(savexbuf, struct secasvar **, savbufcount * sizeof(struct secasvar *)); - if (savexbuf) + if (savexbuf) { savexptr = savexbuf; + } KMALLOC_WAIT(savkabuf, struct secasvar **, savbufcount * sizeof(struct secasvar *)); - if (savkabuf) + if (savkabuf) { savkaptr = savkabuf; + } } lck_mtx_lock(sadb_mutex); /* SPD */ if (spbuf) { - struct secpolicy *sp, *nextsp; for (dir = 0; dir < IPSEC_DIR_MAX; dir++) { for (sp = LIST_FIRST(&sptree[dir]); - sp != NULL; - sp = nextsp) { - - spd_count++; + sp != NULL; + sp = nextsp) { + /* don't prevent timehandler from stopping for generate policy */ + if (sp->policy != IPSEC_POLICY_GENERATE) { + stop_handler = 0; + } + spd_count++; nextsp = LIST_NEXT(sp, chain); if (sp->state == IPSEC_SPSTATE_DEAD) { @@ -5224,14 +6378,15 @@ key_timehandler(void) continue; } - if (sp->lifetime == 0 && sp->validtime == 0) + if (sp->lifetime == 0 && sp->validtime == 0) { continue; + } if (spbuf && spcount < spbufcount) { /* the deletion will occur next time */ if ((sp->lifetime - && tv.tv_sec - sp->created > sp->lifetime) + && tv.tv_sec - sp->created > sp->lifetime) || (sp->validtime - && tv.tv_sec - sp->lastused > sp->validtime)) { + && tv.tv_sec - sp->lastused > sp->validtime)) { //key_spdexpire(sp); sp->state = IPSEC_SPSTATE_DEAD; sp->refcnt++; @@ -5244,17 +6399,16 @@ key_timehandler(void) } /* SAD */ - if (savbufcount != 0) { + { struct secashead *sah, *nextsah; struct secasvar *sav, *nextsav; - + for (sah = LIST_FIRST(&sahtree); - sah != NULL; - sah = nextsah) { - - sah_count++; + sah != NULL; + sah = nextsah) { + sah_count++; nextsah = LIST_NEXT(sah, chain); - + /* if sah has been dead, then delete it and process next sah. */ if (sah->state == SADB_SASTATE_DEAD) { key_delsah(sah); @@ -5263,28 +6417,48 @@ key_timehandler(void) } if (LIST_FIRST(&sah->savtree[SADB_SASTATE_LARVAL]) == NULL && - LIST_FIRST(&sah->savtree[SADB_SASTATE_MATURE]) == NULL && - LIST_FIRST(&sah->savtree[SADB_SASTATE_DYING]) == NULL && + LIST_FIRST(&sah->savtree[SADB_SASTATE_MATURE]) == NULL && + LIST_FIRST(&sah->savtree[SADB_SASTATE_DYING]) == NULL && LIST_FIRST(&sah->savtree[SADB_SASTATE_DEAD]) == NULL) { - key_delsah(sah); + key_delsah(sah); empty_sah_count++; continue; } + if (savbufcount == 0) { + continue; + } + + stop_handler = 0; + /* if LARVAL entry doesn't become MATURE, delete it. */ for (sav = LIST_FIRST(&sah->savtree[SADB_SASTATE_LARVAL]); - sav != NULL; - sav = nextsav) { - - larval_sav_count++; + sav != NULL; + sav = nextsav) { + larval_sav_count++; total_sav_count++; nextsav = LIST_NEXT(sav, chain); - - if (tv.tv_sec - sav->created > key_larval_lifetime) { - key_freesav(sav, KEY_SADB_LOCKED); + + if (sav->lft_h != NULL) { + /* If a hard lifetime is defined for the LARVAL SA, use it */ + if (sav->lft_h->sadb_lifetime_addtime != 0 + && tv.tv_sec - sav->created > sav->lft_h->sadb_lifetime_addtime) { + if (sav->always_expire) { + key_send_delete(sav); + sav = NULL; + } else { + key_sa_chgstate(sav, SADB_SASTATE_DEAD); + key_freesav(sav, KEY_SADB_LOCKED); + sav = NULL; + } + } + } else { + if (tv.tv_sec - sav->created > key_larval_lifetime) { + key_freesav(sav, KEY_SADB_LOCKED); + } } } - + /* * If this is a NAT traversal SA with no activity, * we need to send a keep alive. @@ -5296,58 +6470,57 @@ key_timehandler(void) * when to send the keepalive. */ if (savkabuf && savkacount < savbufcount) { - sav = LIST_FIRST(&sah->savtree[SADB_SASTATE_MATURE]); //%%% should we check dying list if this is empty??? - if (natt_keepalive_interval && sav && - (sav->flags & (SADB_X_EXT_NATT_KEEPALIVE | SADB_X_EXT_ESP_KEEPALIVE)) != 0) { + sav = LIST_FIRST(&sah->savtree[SADB_SASTATE_MATURE]); //%%% should we check dying list if this is empty??? + if (sav && (natt_keepalive_interval || sav->natt_interval) && + (sav->flags & (SADB_X_EXT_NATT_KEEPALIVE | SADB_X_EXT_ESP_KEEPALIVE)) != 0) { sav->refcnt++; *savkaptr++ = sav; savkacount++; } } - + /* * check MATURE entry to start to send expire message * whether or not. */ for (sav = LIST_FIRST(&sah->savtree[SADB_SASTATE_MATURE]); - sav != NULL; - sav = nextsav) { - - mature_sav_count++; + sav != NULL; + sav = nextsav) { + mature_sav_count++; total_sav_count++; nextsav = LIST_NEXT(sav, chain); - + /* we don't need to check. */ - if (sav->lft_s == NULL) + if (sav->lft_s == NULL) { continue; - + } + /* sanity check */ if (sav->lft_c == NULL) { - ipseclog((LOG_DEBUG,"key_timehandler: " - "There is no CURRENT time, why?\n")); + ipseclog((LOG_DEBUG, "key_timehandler: " + "There is no CURRENT time, why?\n")); continue; } - + /* check SOFT lifetime */ if (sav->lft_s->sadb_lifetime_addtime != 0 - && tv.tv_sec - sav->created > sav->lft_s->sadb_lifetime_addtime) { + && tv.tv_sec - sav->created > sav->lft_s->sadb_lifetime_addtime) { /* - * check the SA if it has been used. - * when it hasn't been used, delete it. - * i don't think such SA will be used. + * If always_expire is set, expire. Otherwise, + * if the SA has not been used, delete immediately. */ - if (sav->lft_c->sadb_lifetime_usetime == 0) { + if (sav->lft_c->sadb_lifetime_usetime == 0 + && sav->always_expire == 0) { key_sa_chgstate(sav, SADB_SASTATE_DEAD); key_freesav(sav, KEY_SADB_LOCKED); sav = NULL; } else if (savexbuf && savexcount < savbufcount) { - key_sa_chgstate(sav, SADB_SASTATE_DYING); + key_sa_chgstate(sav, SADB_SASTATE_DYING); sav->refcnt++; *savexptr++ = sav; savexcount++; } } - /* check SOFT lifetime by bytes */ /* * XXX I don't know the way to delete this SA @@ -5355,9 +6528,8 @@ key_timehandler(void) * installed too big lifetime by time. */ else if (savexbuf && savexcount < savbufcount - && sav->lft_s->sadb_lifetime_bytes != 0 - && sav->lft_s->sadb_lifetime_bytes < sav->lft_c->sadb_lifetime_bytes) { - + && sav->lft_s->sadb_lifetime_bytes != 0 + && sav->lft_s->sadb_lifetime_bytes < sav->lft_c->sadb_lifetime_bytes) { /* * XXX If we keep to send expire * message in the status of @@ -5373,40 +6545,45 @@ key_timehandler(void) /* check DYING entry to change status to DEAD. */ for (sav = LIST_FIRST(&sah->savtree[SADB_SASTATE_DYING]); - sav != NULL; - sav = nextsav) { - - dying_sav_count++; + sav != NULL; + sav = nextsav) { + dying_sav_count++; total_sav_count++; nextsav = LIST_NEXT(sav, chain); - + /* we don't need to check. */ - if (sav->lft_h == NULL) + if (sav->lft_h == NULL) { continue; - + } + /* sanity check */ if (sav->lft_c == NULL) { ipseclog((LOG_DEBUG, "key_timehandler: " - "There is no CURRENT time, why?\n")); + "There is no CURRENT time, why?\n")); continue; } - + if (sav->lft_h->sadb_lifetime_addtime != 0 - && tv.tv_sec - sav->created > sav->lft_h->sadb_lifetime_addtime) { - key_sa_chgstate(sav, SADB_SASTATE_DEAD); - key_freesav(sav, KEY_SADB_LOCKED); - sav = NULL; + && tv.tv_sec - sav->created > sav->lft_h->sadb_lifetime_addtime) { + if (sav->always_expire) { + key_send_delete(sav); + sav = NULL; + } else { + key_sa_chgstate(sav, SADB_SASTATE_DEAD); + key_freesav(sav, KEY_SADB_LOCKED); + sav = NULL; + } } -#if 0 /* XXX Should we keep to send expire message until HARD lifetime ? */ +#if 0 /* XXX Should we keep to send expire message until HARD lifetime ? */ else if (savbuf && savexcount < savbufcount - && sav->lft_s != NULL - && sav->lft_s->sadb_lifetime_addtime != 0 - && tv.tv_sec - sav->created > sav->lft_s->sadb_lifetime_addtime) { + && sav->lft_s != NULL + && sav->lft_s->sadb_lifetime_addtime != 0 + && tv.tv_sec - sav->created > sav->lft_s->sadb_lifetime_addtime) { /* * XXX: should be checked to be * installed the valid SA. */ - + /* * If there is no SA then sending * expire message. @@ -5419,31 +6596,30 @@ key_timehandler(void) #endif /* check HARD lifetime by bytes */ else if (sav->lft_h->sadb_lifetime_bytes != 0 - && sav->lft_h->sadb_lifetime_bytes < sav->lft_c->sadb_lifetime_bytes) { + && sav->lft_h->sadb_lifetime_bytes < sav->lft_c->sadb_lifetime_bytes) { key_sa_chgstate(sav, SADB_SASTATE_DEAD); key_freesav(sav, KEY_SADB_LOCKED); sav = NULL; } } - + /* delete entry in DEAD */ for (sav = LIST_FIRST(&sah->savtree[SADB_SASTATE_DEAD]); - sav != NULL; - sav = nextsav) { - - dead_sav_count++; + sav != NULL; + sav = nextsav) { + dead_sav_count++; total_sav_count++; nextsav = LIST_NEXT(sav, chain); - + /* sanity check */ if (sav->state != SADB_SASTATE_DEAD) { ipseclog((LOG_DEBUG, "key_timehandler: " - "invalid sav->state " - "(queue: %d SA: %d): " - "kill it anyway\n", - SADB_SASTATE_DEAD, sav->state)); + "invalid sav->state " + "(queue: %d SA: %d): " + "kill it anyway\n", + SADB_SASTATE_DEAD, sav->state)); } - + /* * do not call key_freesav() here. * sav should already be freed, and sav->refcnt @@ -5452,87 +6628,90 @@ key_timehandler(void) */ } } - } - - if (++key_timehandler_debug >= 300) { - if (key_debug_level) { - printf("%s: total stats for %u calls\n", __FUNCTION__, key_timehandler_debug); - printf("%s: walked %u SPDs\n", __FUNCTION__, spd_count); - printf("%s: walked %llu SAs: LARVAL SAs %u, MATURE SAs %u, DYING SAs %u, DEAD SAs %u\n", __FUNCTION__, - total_sav_count, larval_sav_count, mature_sav_count, dying_sav_count, dead_sav_count); - printf("%s: walked %u SAHs: DEAD SAHs %u, EMPTY SAHs %u\n", __FUNCTION__, - sah_count, dead_sah_count, empty_sah_count); - if (sah_search_calls) { - printf("%s: SAH search cost %d iters per call\n", __FUNCTION__, - (sah_search_count/sah_search_calls)); - } - } - spd_count = 0; - sah_count = 0; - dead_sah_count = 0; - empty_sah_count = 0; - larval_sav_count = 0; - mature_sav_count = 0; - dying_sav_count = 0; - dead_sav_count = 0; - total_sav_count = 0; - sah_search_count = 0; - sah_search_calls = 0; - key_timehandler_debug = 0; - } + } + + if (++key_timehandler_debug >= 300) { + if (key_debug_level) { + printf("%s: total stats for %u calls\n", __FUNCTION__, key_timehandler_debug); + printf("%s: walked %u SPDs\n", __FUNCTION__, spd_count); + printf("%s: walked %llu SAs: LARVAL SAs %u, MATURE SAs %u, DYING SAs %u, DEAD SAs %u\n", __FUNCTION__, + total_sav_count, larval_sav_count, mature_sav_count, dying_sav_count, dead_sav_count); + printf("%s: walked %u SAHs: DEAD SAHs %u, EMPTY SAHs %u\n", __FUNCTION__, + sah_count, dead_sah_count, empty_sah_count); + if (sah_search_calls) { + printf("%s: SAH search cost %d iters per call\n", __FUNCTION__, + (sah_search_count / sah_search_calls)); + } + } + spd_count = 0; + sah_count = 0; + dead_sah_count = 0; + empty_sah_count = 0; + larval_sav_count = 0; + mature_sav_count = 0; + dying_sav_count = 0; + dead_sav_count = 0; + total_sav_count = 0; + sah_search_count = 0; + sah_search_calls = 0; + key_timehandler_debug = 0; + } #ifndef IPSEC_NONBLOCK_ACQUIRE /* ACQ tree */ - { - struct secacq *acq, *nextacq; - - for (acq = LIST_FIRST(&acqtree); - acq != NULL; - acq = nextacq) { - - nextacq = LIST_NEXT(acq, chain); - - if (tv.tv_sec - acq->created > key_blockacq_lifetime - && __LIST_CHAINED(acq)) { - LIST_REMOVE(acq, chain); - KFREE(acq); + { + struct secacq *acq, *nextacq; + + for (acq = LIST_FIRST(&acqtree); + acq != NULL; + acq = nextacq) { + stop_handler = 0; + nextacq = LIST_NEXT(acq, chain); + + if (tv.tv_sec - acq->created > key_blockacq_lifetime + && __LIST_CHAINED(acq)) { + LIST_REMOVE(acq, chain); + KFREE(acq); + } } } - } #endif /* SP ACQ tree */ - { - struct secspacq *acq, *nextacq; - - for (acq = LIST_FIRST(&spacqtree); - acq != NULL; - acq = nextacq) { - - nextacq = LIST_NEXT(acq, chain); - - if (tv.tv_sec - acq->created > key_blockacq_lifetime - && __LIST_CHAINED(acq)) { - LIST_REMOVE(acq, chain); - KFREE(acq); + { + struct secspacq *acq, *nextacq; + + for (acq = LIST_FIRST(&spacqtree); + acq != NULL; + acq = nextacq) { + stop_handler = 0; + nextacq = LIST_NEXT(acq, chain); + + if (tv.tv_sec - acq->created > key_blockacq_lifetime + && __LIST_CHAINED(acq)) { + LIST_REMOVE(acq, chain); + KFREE(acq); + } } } - } /* initialize random seed */ if (key_tick_init_random++ > key_int_random) { key_tick_init_random = 0; key_srandom(); } - - natt_now++; + + uint64_t acc_sleep_time = 0; + absolutetime_to_nanoseconds(mach_absolutetime_asleep, &acc_sleep_time); + natt_now = ++up_time + (acc_sleep_time / NSEC_PER_SEC); lck_mtx_unlock(sadb_mutex); /* send messages outside of sadb_mutex */ if (spbuf && spcount > 0) { cnt = spcount; - while (cnt--) + while (cnt--) { key_spdexpire(*(--spptr)); + } } if (savkabuf && savkacount > 0) { struct secasvar **savkaptr_sav = savkaptr; @@ -5545,42 +6724,49 @@ key_timehandler(void) int cnt_update = savkacount; while (cnt_update--) { key_update_natt_keepalive_timestamp(*savkaptr, - *(--savkaptr_update)); + *(--savkaptr_update)); } } } } if (savexbuf && savexcount > 0) { cnt = savexcount; - while (cnt--) + while (cnt--) { key_expire(*(--savexptr)); + } } - + /* decrement ref counts and free buffers */ lck_mtx_lock(sadb_mutex); if (spbuf) { - while (spcount--) + while (spcount--) { key_freesp(*spptr++, KEY_SADB_LOCKED); + } KFREE(spbuf); } if (savkabuf) { - while (savkacount--) + while (savkacount--) { key_freesav(*savkaptr++, KEY_SADB_LOCKED); + } KFREE(savkabuf); } if (savexbuf) { - while (savexcount--) + while (savexcount--) { key_freesav(*savexptr++, KEY_SADB_LOCKED); + } KFREE(savexbuf); } - lck_mtx_unlock(sadb_mutex); - -#ifndef IPSEC_DEBUG2 - /* do exchange to tick time !! */ - (void)timeout((void *)key_timehandler, (void *)0, hz); -#endif /* IPSEC_DEBUG2 */ + if (stop_handler) { + key_timehandler_running = 0; + /* Turn on the ipsec bypass */ + ipsec_bypass = 1; + } else { + /* do exchange to tick time !! */ + (void)timeout((void *)key_timehandler, (void *)0, hz); + } + lck_mtx_unlock(sadb_mutex); return; } @@ -5619,8 +6805,7 @@ key_randomfill( size_t l) { #ifdef __APPLE__ - - read_random(p, (u_int)l); + cc_rand_generate(p, l); #else size_t n; u_int32_t v; @@ -5661,9 +6846,6 @@ key_satype2proto( return IPPROTO_AH; case SADB_SATYPE_ESP: return IPPROTO_ESP; - case SADB_X_SATYPE_IPCOMP: - return IPPROTO_IPCOMP; - break; default: return 0; } @@ -5684,15 +6866,44 @@ key_proto2satype( return SADB_SATYPE_AH; case IPPROTO_ESP: return SADB_SATYPE_ESP; - case IPPROTO_IPCOMP: - return SADB_X_SATYPE_IPCOMP; - break; default: return 0; } /* NOTREACHED */ } +static ifnet_t +key_get_ipsec_if_from_message(const struct sadb_msghdr *mhp, int message_type) +{ + struct sadb_x_ipsecif *ipsecifopts = NULL; + ifnet_t ipsec_if = NULL; + + ipsecifopts = (struct sadb_x_ipsecif *)(void *)mhp->ext[message_type]; + if (ipsecifopts != NULL) { + if (ipsecifopts->sadb_x_ipsecif_ipsec_if[0]) { + ifnet_find_by_name(ipsecifopts->sadb_x_ipsecif_ipsec_if, &ipsec_if); + } + } + + return ipsec_if; +} + +static u_int +key_get_outgoing_ifindex_from_message(const struct sadb_msghdr *mhp, int message_type) +{ + struct sadb_x_ipsecif *ipsecifopts = NULL; + ifnet_t outgoing_if = NULL; + + ipsecifopts = (struct sadb_x_ipsecif *)(void *)mhp->ext[message_type]; + if (ipsecifopts != NULL) { + if (ipsecifopts->sadb_x_ipsecif_outgoing_if[0]) { + ifnet_find_by_name(ipsecifopts->sadb_x_ipsecif_outgoing_if, &outgoing_if); + } + } + + return outgoing_if ? outgoing_if->if_index : 0; +} + /* %%% PF_KEY */ /* * SADB_GETSPI processing is to receive @@ -5716,17 +6927,19 @@ key_getspi( struct secasindex saidx; struct secashead *newsah; struct secasvar *newsav; + ifnet_t ipsec_if = NULL; u_int8_t proto; u_int32_t spi; u_int8_t mode; u_int32_t reqid; int error; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); - + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); + /* sanity check */ - if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) + if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) { panic("key_getspi: NULL pointer is passed.\n"); + } if (mhp->ext[SADB_EXT_ADDRESS_SRC] == NULL || mhp->ext[SADB_EXT_ADDRESS_DST] == NULL) { @@ -5751,6 +6964,8 @@ key_getspi( 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")); @@ -5761,38 +6976,42 @@ key_getspi( switch (((struct sockaddr *)(src0 + 1))->sa_family) { case AF_INET: if (((struct sockaddr *)(src0 + 1))->sa_len != - sizeof(struct sockaddr_in)) + sizeof(struct sockaddr_in)) { return key_senderror(so, m, EINVAL); + } ((struct sockaddr_in *)(void *)(src0 + 1))->sin_port = 0; break; case AF_INET6: if (((struct sockaddr *)(src0 + 1))->sa_len != - sizeof(struct sockaddr_in6)) + sizeof(struct sockaddr_in6)) { return key_senderror(so, m, EINVAL); + } ((struct sockaddr_in6 *)(void *)(src0 + 1))->sin6_port = 0; break; default: - ; /*???*/ + ; /*???*/ } switch (((struct sockaddr *)(dst0 + 1))->sa_family) { case AF_INET: if (((struct sockaddr *)(dst0 + 1))->sa_len != - sizeof(struct sockaddr_in)) + sizeof(struct sockaddr_in)) { return key_senderror(so, m, EINVAL); + } ((struct sockaddr_in *)(void *)(dst0 + 1))->sin_port = 0; break; case AF_INET6: if (((struct sockaddr *)(dst0 + 1))->sa_len != - sizeof(struct sockaddr_in6)) + sizeof(struct sockaddr_in6)) { return key_senderror(so, m, EINVAL); + } ((struct sockaddr_in6 *)(void *)(dst0 + 1))->sin6_port = 0; break; default: - ; /*???*/ + ; /*???*/ } /* XXX boundary check against sa_len */ - KEY_SETSECASIDX(proto, mode, reqid, src0 + 1, dst0 + 1, &saidx); + KEY_SETSECASIDX(proto, mode, reqid, src0 + 1, dst0 + 1, ipsec_if ? ipsec_if->if_index : 0, &saidx); lck_mtx_lock(sadb_mutex); @@ -5807,7 +7026,7 @@ key_getspi( /* get a SA index */ if ((newsah = key_getsah(&saidx)) == NULL) { /* create a new SA index: key_addspi is always used for inbound spi */ - if ((newsah = key_newsah(&saidx, IPSEC_DIR_INBOUND)) == NULL) { + if ((newsah = key_newsah(&saidx, ipsec_if, key_get_outgoing_ifindex_from_message(mhp, SADB_X_EXT_IPSECIF), IPSEC_DIR_INBOUND)) == NULL) { lck_mtx_unlock(sadb_mutex); ipseclog((LOG_DEBUG, "key_getspi: No more memory.\n")); return key_senderror(so, m, ENOBUFS); @@ -5816,7 +7035,7 @@ key_getspi( /* get a new SA */ /* XXX rewrite */ - newsav = key_newsav(m, mhp, newsah, &error); + newsav = key_newsav(m, mhp, newsah, &error, so); if (newsav == NULL) { /* XXX don't free new SA index allocated in above. */ lck_mtx_unlock(sadb_mutex); @@ -5837,128 +7056,137 @@ key_getspi( acq->created = tv.tv_sec; acq->count = 0; } - } + } #endif lck_mtx_unlock(sadb_mutex); - - { - struct mbuf *n, *nn; - struct sadb_sa *m_sa; - struct sadb_msg *newmsg; - int off, len; - /* create new sadb_msg to reply. */ - len = PFKEY_ALIGN8(sizeof(struct sadb_msg)) + - PFKEY_ALIGN8(sizeof(struct sadb_sa)); - if (len > MCLBYTES) - return key_senderror(so, m, ENOBUFS); + { + struct mbuf *n, *nn; + struct sadb_sa *m_sa; + struct sadb_msg *newmsg; + int off, len; + + /* create new sadb_msg to reply. */ + len = PFKEY_ALIGN8(sizeof(struct sadb_msg)) + + PFKEY_ALIGN8(sizeof(struct sadb_sa)); + if (len > MCLBYTES) { + return key_senderror(so, m, ENOBUFS); + } - MGETHDR(n, M_WAITOK, MT_DATA); - if (n && len > MHLEN) { - MCLGET(n, M_WAITOK); - if ((n->m_flags & M_EXT) == 0) { - m_freem(n); - n = NULL; + MGETHDR(n, M_WAITOK, MT_DATA); + if (n && len > MHLEN) { + MCLGET(n, M_WAITOK); + if ((n->m_flags & M_EXT) == 0) { + m_freem(n); + n = NULL; + } + } + if (!n) { + return key_senderror(so, m, ENOBUFS); } - } - if (!n) - return key_senderror(so, m, ENOBUFS); - n->m_len = len; - n->m_next = NULL; - off = 0; + n->m_len = len; + n->m_next = NULL; + off = 0; - m_copydata(m, 0, sizeof(struct sadb_msg), mtod(n, caddr_t) + off); - off += PFKEY_ALIGN8(sizeof(struct sadb_msg)); + m_copydata(m, 0, sizeof(struct sadb_msg), mtod(n, caddr_t) + off); + off += PFKEY_ALIGN8(sizeof(struct sadb_msg)); - m_sa = (struct sadb_sa *)(void *)(mtod(n, caddr_t) + off); - m_sa->sadb_sa_len = PFKEY_UNIT64(sizeof(struct sadb_sa)); - m_sa->sadb_sa_exttype = SADB_EXT_SA; - m_sa->sadb_sa_spi = htonl(spi); - off += PFKEY_ALIGN8(sizeof(struct sadb_sa)); + m_sa = (struct sadb_sa *)(void *)(mtod(n, caddr_t) + off); + m_sa->sadb_sa_len = PFKEY_UNIT64(sizeof(struct sadb_sa)); + m_sa->sadb_sa_exttype = SADB_EXT_SA; + m_sa->sadb_sa_spi = htonl(spi); + off += PFKEY_ALIGN8(sizeof(struct sadb_sa)); #if DIAGNOSTIC - if (off != len) - panic("length inconsistency in key_getspi"); + if (off != len) { + panic("length inconsistency in key_getspi"); + } #endif - { - int mbufItems[] = {SADB_EXT_ADDRESS_SRC, SADB_EXT_ADDRESS_DST}; - n->m_next = key_gather_mbuf(m, mhp, 0, sizeof(mbufItems)/sizeof(int), mbufItems); - if (!n->m_next) { - m_freem(n); - return key_senderror(so, m, ENOBUFS); - } - } + { + int mbufItems[] = {SADB_EXT_ADDRESS_SRC, SADB_EXT_ADDRESS_DST}; + n->m_next = key_gather_mbuf(m, mhp, 0, sizeof(mbufItems) / sizeof(int), mbufItems); + if (!n->m_next) { + m_freem(n); + return key_senderror(so, m, ENOBUFS); + } + } - if (n->m_len < sizeof(struct sadb_msg)) { - n = m_pullup(n, sizeof(struct sadb_msg)); - if (n == NULL) - return key_sendup_mbuf(so, m, KEY_SENDUP_ONE); - } + if (n->m_len < sizeof(struct sadb_msg)) { + n = m_pullup(n, sizeof(struct sadb_msg)); + if (n == NULL) { + return key_sendup_mbuf(so, m, KEY_SENDUP_ONE); + } + } - n->m_pkthdr.len = 0; - for (nn = n; nn; nn = nn->m_next) - n->m_pkthdr.len += nn->m_len; + n->m_pkthdr.len = 0; + for (nn = n; nn; nn = nn->m_next) { + n->m_pkthdr.len += nn->m_len; + } - 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); + 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); - m_freem(m); - return key_sendup_mbuf(so, n, KEY_SENDUP_ONE); - } + 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) + 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); + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); /* XXX boundary check against sa_len */ - KEY_SETSECASIDX(proto, mode, reqid, src, dst, &saidx); + 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: - ; /*???*/ + 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: - ; /*???*/ + 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); @@ -5983,7 +7211,7 @@ key_do_getnewspi( u_int32_t keymin, keymax; int count = key_spi_trycnt; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED); + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); /* set spi range to allocate */ if (spirange != NULL) { @@ -5993,18 +7221,6 @@ key_do_getnewspi( keymin = key_spi_minval; keymax = key_spi_maxval; } - /* IPCOMP needs 2-byte SPI */ - if (saidx->proto == IPPROTO_IPCOMP) { - u_int32_t t; - if (keymin >= 0x10000) - keymin = 0xffff; - if (keymax >= 0x10000) - keymax = 0xffff; - if (keymin > keymax) { - t = keymin; keymin = keymax; keymax = t; - } - } - if (keymin == keymax) { if (key_checkspidup(saidx, keymin) != NULL) { ipseclog((LOG_DEBUG, "key_do_getnewspi: SPI %u exists already.\n", keymin)); @@ -6013,9 +7229,7 @@ key_do_getnewspi( count--; /* taking one cost. */ newspi = keymin; - } else { - u_int32_t range = keymax - keymin + 1; /* overflow value of zero means full range */ /* init SPI */ @@ -6024,12 +7238,13 @@ key_do_getnewspi( /* when requesting to allocate spi ranged */ while (count--) { u_int32_t rand_val = key_random(); - + /* generate pseudo-random SPI value ranged. */ newspi = (range == 0 ? rand_val : keymin + (rand_val % range)); - if (key_checkspidup(saidx, newspi) == NULL) + if (key_checkspidup(saidx, newspi) == NULL) { break; + } } if (count == 0 || newspi == 0) { @@ -6040,7 +7255,7 @@ key_do_getnewspi( /* statistics */ keystat.getspi_count = - (keystat.getspi_count + key_spi_trycnt - count) / 2; + (keystat.getspi_count + key_spi_trycnt - count) / 2; return newspi; } @@ -6066,19 +7281,22 @@ key_update( { struct sadb_sa *sa0; struct sadb_address *src0, *dst0; + ifnet_t ipsec_if = NULL; struct secasindex saidx; struct secashead *sah; struct secasvar *sav; u_int16_t proto; u_int8_t mode; u_int32_t reqid; + u_int16_t flags2; int error; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); - + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); + /* sanity check */ - if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) + if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) { panic("key_update: NULL pointer is passed.\n"); + } /* map satype to proto */ if ((proto = key_satype2proto(mhp->msg->sadb_msg_satype)) == 0) { @@ -6090,13 +7308,13 @@ key_update( mhp->ext[SADB_EXT_ADDRESS_SRC] == NULL || mhp->ext[SADB_EXT_ADDRESS_DST] == NULL || (mhp->msg->sadb_msg_satype == SADB_SATYPE_ESP && - mhp->ext[SADB_EXT_KEY_ENCRYPT] == NULL) || + mhp->ext[SADB_EXT_KEY_ENCRYPT] == NULL) || (mhp->msg->sadb_msg_satype == SADB_SATYPE_AH && - mhp->ext[SADB_EXT_KEY_AUTH] == NULL) || + mhp->ext[SADB_EXT_KEY_AUTH] == NULL) || (mhp->ext[SADB_EXT_LIFETIME_HARD] != NULL && - mhp->ext[SADB_EXT_LIFETIME_SOFT] == NULL) || + mhp->ext[SADB_EXT_LIFETIME_SOFT] == NULL) || (mhp->ext[SADB_EXT_LIFETIME_HARD] == NULL && - mhp->ext[SADB_EXT_LIFETIME_SOFT] != NULL)) { + mhp->ext[SADB_EXT_LIFETIME_SOFT] != NULL)) { ipseclog((LOG_DEBUG, "key_update: invalid message is passed.\n")); return key_senderror(so, m, EINVAL); } @@ -6111,18 +7329,21 @@ key_update( (void *)mhp->ext[SADB_X_EXT_SA2])->sadb_x_sa2_mode; reqid = ((struct sadb_x_sa2 *) (void *)mhp->ext[SADB_X_EXT_SA2])->sadb_x_sa2_reqid; + flags2 = ((struct sadb_x_sa2 *)(void *)mhp->ext[SADB_X_EXT_SA2])->sadb_x_sa2_flags; } else { mode = IPSEC_MODE_ANY; reqid = 0; + flags2 = 0; } /* XXX boundary checking for other extensions */ sa0 = (struct sadb_sa *)(void *)mhp->ext[SADB_EXT_SA]; 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); /* XXX boundary check against sa_len */ - KEY_SETSECASIDX(proto, mode, reqid, src0 + 1, dst0 + 1, &saidx); + KEY_SETSECASIDX(proto, mode, reqid, src0 + 1, dst0 + 1, ipsec_if ? ipsec_if->if_index : 0, &saidx); lck_mtx_lock(sadb_mutex); @@ -6141,91 +7362,252 @@ key_update( return key_senderror(so, m, error); } - /* find a SA with sequence number. */ -#if IPSEC_DOSEQCHECK - if (mhp->msg->sadb_msg_seq != 0 - && (sav = key_getsavbyseq(sah, mhp->msg->sadb_msg_seq)) == NULL) { - lck_mtx_unlock(sadb_mutex); - ipseclog((LOG_DEBUG, - "key_update: no larval SA with sequence %u exists.\n", - mhp->msg->sadb_msg_seq)); - return key_senderror(so, m, ENOENT); + /* find a SA with sequence number. */ +#if IPSEC_DOSEQCHECK + if (mhp->msg->sadb_msg_seq != 0 + && (sav = key_getsavbyseq(sah, mhp->msg->sadb_msg_seq)) == NULL) { + lck_mtx_unlock(sadb_mutex); + ipseclog((LOG_DEBUG, + "key_update: no larval SA with sequence %u exists.\n", + mhp->msg->sadb_msg_seq)); + return key_senderror(so, m, ENOENT); + } +#else + 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); + } +#endif + + /* validity check */ + if (sav->sah->saidx.proto != proto) { + lck_mtx_unlock(sadb_mutex); + ipseclog((LOG_DEBUG, + "key_update: protocol mismatched (DB=%u param=%u)\n", + sav->sah->saidx.proto, proto)); + return key_senderror(so, m, EINVAL); + } +#if IPSEC_DOSEQCHECK + if (sav->spi != sa0->sadb_sa_spi) { + lck_mtx_unlock(sadb_mutex); + ipseclog((LOG_DEBUG, + "key_update: SPI mismatched (DB:%u param:%u)\n", + (u_int32_t)ntohl(sav->spi), + (u_int32_t)ntohl(sa0->sadb_sa_spi))); + return key_senderror(so, m, EINVAL); + } +#endif + if (sav->pid != mhp->msg->sadb_msg_pid) { + lck_mtx_unlock(sadb_mutex); + ipseclog((LOG_DEBUG, + "key_update: pid mismatched (DB:%u param:%u)\n", + sav->pid, mhp->msg->sadb_msg_pid)); + return key_senderror(so, m, EINVAL); + } + + /* copy sav values */ + error = key_setsaval(sav, m, mhp); + if (error) { + key_freesav(sav, KEY_SADB_LOCKED); + lck_mtx_unlock(sadb_mutex); + return key_senderror(so, m, error); + } + + sav->flags2 = flags2; + if (flags2 & SADB_X_EXT_SA2_DELETE_ON_DETACH) { + sav->so = so; + } + + /* + * Verify if SADB_X_EXT_NATT_MULTIPLEUSERS flag is set that + * this SA is for transport mode - otherwise clear it. + */ + if ((sav->flags & SADB_X_EXT_NATT_MULTIPLEUSERS) != 0 && + (sav->sah->saidx.mode != IPSEC_MODE_TRANSPORT || + sav->sah->saidx.src.ss_family != AF_INET)) { + sav->flags &= ~SADB_X_EXT_NATT_MULTIPLEUSERS; + } + + /* check SA values to be mature. */ + if ((error = key_mature(sav)) != 0) { + key_freesav(sav, KEY_SADB_LOCKED); + lck_mtx_unlock(sadb_mutex); + return key_senderror(so, m, error); + } + + lck_mtx_unlock(sadb_mutex); + + { + struct mbuf *n; + + /* set msg buf from mhp */ + n = key_getmsgbuf_x1(m, mhp); + if (n == NULL) { + ipseclog((LOG_DEBUG, "key_update: No more memory.\n")); + return key_senderror(so, m, ENOBUFS); + } + + m_freem(m); + return key_sendup_mbuf(so, n, KEY_SENDUP_ALL); + } +} + +static int +key_migrate(struct socket *so, + struct mbuf *m, + const struct sadb_msghdr *mhp) +{ + struct sadb_sa *sa0 = NULL; + struct sadb_address *src0 = NULL; + struct sadb_address *dst0 = NULL; + struct sadb_address *src1 = NULL; + struct sadb_address *dst1 = NULL; + ifnet_t ipsec_if0 = NULL; + ifnet_t ipsec_if1 = NULL; + struct secasindex saidx0; + struct secasindex saidx1; + struct secashead *sah = NULL; + struct secashead *newsah = NULL; + struct secasvar *sav = NULL; + u_int16_t proto; + + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); + + /* sanity check */ + if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) { + panic("key_migrate: NULL pointer is passed.\n"); + } + + /* map satype to proto */ + if ((proto = key_satype2proto(mhp->msg->sadb_msg_satype)) == 0) { + ipseclog((LOG_DEBUG, "key_migrate: invalid satype is passed.\n")); + return key_senderror(so, m, EINVAL); + } + + if (mhp->ext[SADB_EXT_SA] == NULL || + mhp->ext[SADB_EXT_ADDRESS_SRC] == NULL || + mhp->ext[SADB_EXT_ADDRESS_DST] == NULL || + mhp->ext[SADB_EXT_MIGRATE_ADDRESS_SRC] == NULL || + mhp->ext[SADB_EXT_MIGRATE_ADDRESS_DST] == NULL) { + ipseclog((LOG_DEBUG, "key_migrate: invalid message is passed.\n")); + 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) || + mhp->extlen[SADB_EXT_MIGRATE_ADDRESS_SRC] < sizeof(struct sadb_address) || + mhp->extlen[SADB_EXT_MIGRATE_ADDRESS_DST] < sizeof(struct sadb_address)) { + ipseclog((LOG_DEBUG, "key_migrate: invalid message is passed.\n")); + return key_senderror(so, m, EINVAL); + } + + lck_mtx_lock(sadb_mutex); + + sa0 = (struct sadb_sa *)(void *)mhp->ext[SADB_EXT_SA]; + src0 = (struct sadb_address *)(mhp->ext[SADB_EXT_ADDRESS_SRC]); + dst0 = (struct sadb_address *)(mhp->ext[SADB_EXT_ADDRESS_DST]); + src1 = (struct sadb_address *)(mhp->ext[SADB_EXT_MIGRATE_ADDRESS_SRC]); + dst1 = (struct sadb_address *)(mhp->ext[SADB_EXT_MIGRATE_ADDRESS_DST]); + 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); + + /* Find existing SAH and SAV */ + KEY_SETSECASIDX(proto, IPSEC_MODE_ANY, 0, src0 + 1, dst0 + 1, ipsec_if0 ? ipsec_if0->if_index : 0, &saidx0); + + LIST_FOREACH(sah, &sahtree, chain) { + if (sah->state != SADB_SASTATE_MATURE) { + continue; + } + if (key_cmpsaidx(&sah->saidx, &saidx0, CMP_HEAD) == 0) { + continue; + } + + sav = key_getsavbyspi(sah, sa0->sadb_sa_spi); + if (sav && sav->state == SADB_SASTATE_MATURE) { + break; + } } -#else - if ((sav = key_getsavbyspi(sah, sa0->sadb_sa_spi)) == NULL) { + if (sah == 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); + ipseclog((LOG_DEBUG, "key_migrate: no mature SAH found.\n")); + return key_senderror(so, m, ENOENT); } -#endif - /* validity check */ - if (sav->sah->saidx.proto != proto) { + if (sav == NULL) { lck_mtx_unlock(sadb_mutex); - ipseclog((LOG_DEBUG, - "key_update: protocol mismatched (DB=%u param=%u)\n", - sav->sah->saidx.proto, proto)); - return key_senderror(so, m, EINVAL); + ipseclog((LOG_DEBUG, "key_migrate: no SA found.\n")); + return key_senderror(so, m, ENOENT); } -#if IPSEC_DOSEQCHECK - if (sav->spi != sa0->sadb_sa_spi) { - lck_mtx_unlock(sadb_mutex); - ipseclog((LOG_DEBUG, - "key_update: SPI mismatched (DB:%u param:%u)\n", - (u_int32_t)ntohl(sav->spi), - (u_int32_t)ntohl(sa0->sadb_sa_spi))); - return key_senderror(so, m, EINVAL); + + /* Find or create new SAH */ + KEY_SETSECASIDX(proto, sah->saidx.mode, sah->saidx.reqid, src1 + 1, dst1 + 1, ipsec_if1 ? ipsec_if1->if_index : 0, &saidx1); + + if ((newsah = key_getsah(&saidx1)) == NULL) { + if ((newsah = key_newsah(&saidx1, ipsec_if1, key_get_outgoing_ifindex_from_message(mhp, SADB_X_EXT_MIGRATE_IPSECIF), sah->dir)) == NULL) { + lck_mtx_unlock(sadb_mutex); + ipseclog((LOG_DEBUG, "key_migrate: No more memory.\n")); + return key_senderror(so, m, ENOBUFS); + } } -#endif - if (sav->pid != mhp->msg->sadb_msg_pid) { + + /* Migrate SAV in to new SAH */ + if (key_migratesav(sav, newsah) != 0) { lck_mtx_unlock(sadb_mutex); - ipseclog((LOG_DEBUG, - "key_update: pid mismatched (DB:%u param:%u)\n", - sav->pid, mhp->msg->sadb_msg_pid)); + ipseclog((LOG_DEBUG, "key_migrate: Failed to migrate SA to new SAH.\n")); return key_senderror(so, m, EINVAL); } - /* copy sav values */ - error = key_setsaval(sav, m, mhp); - if (error) { - key_freesav(sav, KEY_SADB_LOCKED); - lck_mtx_unlock(sadb_mutex); - return key_senderror(so, m, error); - } - + /* Reset NAT values */ + sav->flags = sa0->sadb_sa_flags; + sav->natt_encapsulated_src_port = ((const struct sadb_sa_2*)(sa0))->sadb_sa_natt_src_port; + sav->remote_ike_port = ((const struct sadb_sa_2*)(sa0))->sadb_sa_natt_port; + sav->natt_interval = ((const struct sadb_sa_2*)(sa0))->sadb_sa_natt_interval; + sav->natt_offload_interval = ((const struct sadb_sa_2*)(sa0))->sadb_sa_natt_offload_interval; + sav->natt_last_activity = natt_now; + /* * Verify if SADB_X_EXT_NATT_MULTIPLEUSERS flag is set that - * this SA is for transport mode - otherwise clear it. + * 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 && - (sav->sah->saidx.mode != IPSEC_MODE_TRANSPORT || - sav->sah->saidx.src.ss_family != AF_INET)) - sav->flags &= ~SADB_X_EXT_NATT_MULTIPLEUSERS; - - /* check SA values to be mature. */ - if ((error = key_mature(sav)) != 0) { - key_freesav(sav, KEY_SADB_LOCKED); - lck_mtx_unlock(sadb_mutex); - return key_senderror(so, m, error); + 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; + } } - + lck_mtx_unlock(sadb_mutex); - - { - struct mbuf *n; + { + struct mbuf *n; + struct sadb_msg *newmsg; + int mbufItems[] = {SADB_EXT_RESERVED, SADB_EXT_SA, + SADB_EXT_ADDRESS_SRC, SADB_EXT_ADDRESS_DST, SADB_X_EXT_IPSECIF, + SADB_EXT_MIGRATE_ADDRESS_SRC, SADB_EXT_MIGRATE_ADDRESS_DST, SADB_X_EXT_MIGRATE_IPSECIF}; - /* set msg buf from mhp */ - n = key_getmsgbuf_x1(m, mhp); - if (n == NULL) { - ipseclog((LOG_DEBUG, "key_update: No more memory.\n")); - return key_senderror(so, m, ENOBUFS); - } + /* create new sadb_msg to reply. */ + n = key_gather_mbuf(m, mhp, 1, sizeof(mbufItems) / sizeof(int), mbufItems); + if (!n) { + return key_senderror(so, m, ENOBUFS); + } - m_freem(m); - return key_sendup_mbuf(so, n, KEY_SENDUP_ALL); - } + if (n->m_len < sizeof(struct sadb_msg)) { + n = m_pullup(n, sizeof(struct sadb_msg)); + if (n == NULL) { + return key_senderror(so, m, ENOBUFS); + } + } + newmsg = mtod(n, struct sadb_msg *); + newmsg->sadb_msg_errno = 0; + newmsg->sadb_msg_len = PFKEY_UNIT64(n->m_pkthdr.len); + + m_freem(m); + return key_sendup_mbuf(so, n, KEY_SENDUP_ALL); + } } /* @@ -6244,21 +7626,20 @@ key_getsavbyseq( struct secasvar *sav; u_int state; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED); + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); state = SADB_SASTATE_LARVAL; /* search SAD with sequence number ? */ LIST_FOREACH(sav, &sah->savtree[state], chain) { - KEY_CHKSASTATE(state, sav->state, "key_getsabyseq"); if (sav->seq == seq) { sav->refcnt++; KEYDEBUG(KEYDEBUG_IPSEC_STAMP, - printf("DP key_getsavbyseq cause " - "refcnt++:%d SA:%p\n", - sav->refcnt, sav)); + printf("DP key_getsavbyseq cause " + "refcnt++:%d SA:0x%llx\n", sav->refcnt, + (uint64_t)VM_KERNEL_ADDRPERM(sav))); return sav; } } @@ -6290,6 +7671,7 @@ key_add( { struct sadb_sa *sa0; struct sadb_address *src0, *dst0; + ifnet_t ipsec_if = NULL; struct secasindex saidx; struct secashead *newsah; struct secasvar *newsav; @@ -6298,15 +7680,17 @@ key_add( u_int32_t reqid; int error; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); - + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); + /* sanity check */ - if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) + if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) { panic("key_add: NULL pointer is passed.\n"); + } /* map satype to proto */ if ((proto = key_satype2proto(mhp->msg->sadb_msg_satype)) == 0) { ipseclog((LOG_DEBUG, "key_add: invalid satype is passed.\n")); + bzero_keys(mhp); return key_senderror(so, m, EINVAL); } @@ -6314,14 +7698,15 @@ key_add( mhp->ext[SADB_EXT_ADDRESS_SRC] == NULL || mhp->ext[SADB_EXT_ADDRESS_DST] == NULL || (mhp->msg->sadb_msg_satype == SADB_SATYPE_ESP && - mhp->ext[SADB_EXT_KEY_ENCRYPT] == NULL) || + mhp->ext[SADB_EXT_KEY_ENCRYPT] == NULL) || (mhp->msg->sadb_msg_satype == SADB_SATYPE_AH && - mhp->ext[SADB_EXT_KEY_AUTH] == NULL) || + mhp->ext[SADB_EXT_KEY_AUTH] == NULL) || (mhp->ext[SADB_EXT_LIFETIME_HARD] != NULL && - mhp->ext[SADB_EXT_LIFETIME_SOFT] == NULL) || + mhp->ext[SADB_EXT_LIFETIME_SOFT] == NULL) || (mhp->ext[SADB_EXT_LIFETIME_HARD] == NULL && - mhp->ext[SADB_EXT_LIFETIME_SOFT] != NULL)) { + mhp->ext[SADB_EXT_LIFETIME_SOFT] != NULL)) { ipseclog((LOG_DEBUG, "key_add: invalid message is passed.\n")); + bzero_keys(mhp); return key_senderror(so, m, EINVAL); } if (mhp->extlen[SADB_EXT_SA] < sizeof(struct sadb_sa) || @@ -6329,6 +7714,7 @@ key_add( mhp->extlen[SADB_EXT_ADDRESS_DST] < sizeof(struct sadb_address)) { /* XXX need more */ ipseclog((LOG_DEBUG, "key_add: invalid message is passed.\n")); + bzero_keys(mhp); return key_senderror(so, m, EINVAL); } if (mhp->ext[SADB_X_EXT_SA2] != NULL) { @@ -6344,18 +7730,20 @@ key_add( sa0 = (struct sadb_sa *)(void *)mhp->ext[SADB_EXT_SA]; 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); /* XXX boundary check against sa_len */ - KEY_SETSECASIDX(proto, mode, reqid, src0 + 1, dst0 + 1, &saidx); + KEY_SETSECASIDX(proto, mode, reqid, src0 + 1, dst0 + 1, ipsec_if ? ipsec_if->if_index : 0, &saidx); lck_mtx_lock(sadb_mutex); /* get a SA header */ if ((newsah = key_getsah(&saidx)) == NULL) { /* create a new SA header: key_addspi is always used for outbound spi */ - if ((newsah = key_newsah(&saidx, IPSEC_DIR_OUTBOUND)) == NULL) { + if ((newsah = key_newsah(&saidx, ipsec_if, key_get_outgoing_ifindex_from_message(mhp, SADB_X_EXT_IPSECIF), IPSEC_DIR_OUTBOUND)) == NULL) { lck_mtx_unlock(sadb_mutex); ipseclog((LOG_DEBUG, "key_add: No more memory.\n")); + bzero_keys(mhp); return key_senderror(so, m, ENOBUFS); } } @@ -6365,6 +7753,7 @@ key_add( error = key_setident(newsah, m, mhp); if (error) { lck_mtx_unlock(sadb_mutex); + bzero_keys(mhp); return key_senderror(so, m, error); } @@ -6373,11 +7762,13 @@ key_add( 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); } - newsav = key_newsav(m, mhp, newsah, &error); + 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); } @@ -6386,37 +7777,43 @@ key_add( * this SA is for transport mode - otherwise clear it. */ if ((newsav->flags & SADB_X_EXT_NATT_MULTIPLEUSERS) != 0 && - (newsah->saidx.mode != IPSEC_MODE_TRANSPORT || - newsah->saidx.dst.ss_family != AF_INET)) + (newsah->saidx.mode != IPSEC_MODE_TRANSPORT || + newsah->saidx.dst.ss_family != AF_INET)) { newsav->flags &= ~SADB_X_EXT_NATT_MULTIPLEUSERS; + } /* 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); } lck_mtx_unlock(sadb_mutex); - + /* * don't call key_freesav() here, as we would like to keep the SA * in the database on success. */ - { - struct mbuf *n; + { + struct mbuf *n; - /* set msg buf from mhp */ - n = key_getmsgbuf_x1(m, mhp); - if (n == NULL) { - ipseclog((LOG_DEBUG, "key_update: No more memory.\n")); - return key_senderror(so, m, ENOBUFS); - } + /* set msg buf from mhp */ + n = key_getmsgbuf_x1(m, mhp); + if (n == NULL) { + ipseclog((LOG_DEBUG, "key_update: No more memory.\n")); + bzero_keys(mhp); + return key_senderror(so, m, ENOBUFS); + } - m_freem(m); - return key_sendup_mbuf(so, n, KEY_SENDUP_ALL); - } + // mh.ext points to the mbuf content. + // Zero out Encryption and Integrity keys if present. + bzero_keys(mhp); + m_freem(m); + return key_sendup_mbuf(so, n, KEY_SENDUP_ALL); + } } /* m is retained */ @@ -6429,11 +7826,12 @@ key_setident( const struct sadb_ident *idsrc, *iddst; int idsrclen, iddstlen; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED); + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); /* sanity check */ - if (sah == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) + 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 && @@ -6442,7 +7840,7 @@ key_setident( 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")); @@ -6470,7 +7868,7 @@ key_setident( /* XXX do nothing */ sah->idents = NULL; sah->identd = NULL; - return 0; + return 0; } /* make structure */ @@ -6504,7 +7902,7 @@ key_setident( /* * m will not be freed on return. - * it is caller's responsibility to free the result. + * it is caller's responsibility to free the result. */ static struct mbuf * key_getmsgbuf_x1( @@ -6513,24 +7911,27 @@ key_getmsgbuf_x1( { struct mbuf *n; int mbufItems[] = {SADB_EXT_RESERVED, SADB_EXT_SA, - SADB_X_EXT_SA2, SADB_EXT_ADDRESS_SRC, - SADB_EXT_ADDRESS_DST, SADB_EXT_LIFETIME_HARD, - SADB_EXT_LIFETIME_SOFT, SADB_EXT_IDENTITY_SRC, - SADB_EXT_IDENTITY_DST}; + SADB_X_EXT_SA2, SADB_EXT_ADDRESS_SRC, + SADB_EXT_ADDRESS_DST, SADB_EXT_LIFETIME_HARD, + SADB_EXT_LIFETIME_SOFT, SADB_EXT_IDENTITY_SRC, + SADB_EXT_IDENTITY_DST}; /* sanity check */ - if (m == NULL || mhp == NULL || mhp->msg == NULL) + if (m == NULL || mhp == NULL || mhp->msg == NULL) { panic("key_getmsgbuf_x1: NULL pointer is passed.\n"); + } /* create new sadb_msg to reply. */ - n = key_gather_mbuf(m, mhp, 1, sizeof(mbufItems)/sizeof(int), mbufItems); - if (!n) + n = key_gather_mbuf(m, mhp, 1, sizeof(mbufItems) / sizeof(int), mbufItems); + if (!n) { return NULL; + } if (n->m_len < sizeof(struct sadb_msg)) { n = m_pullup(n, sizeof(struct sadb_msg)); - if (n == NULL) + if (n == NULL) { return NULL; + } } mtod(n, struct sadb_msg *)->sadb_msg_errno = 0; mtod(n, struct sadb_msg *)->sadb_msg_len = @@ -6540,7 +7941,7 @@ key_getmsgbuf_x1( } static int key_delete_all(struct socket *, struct mbuf *, - const struct sadb_msghdr *, u_int16_t); + const struct sadb_msghdr *, u_int16_t); /* * SADB_DELETE processing @@ -6561,16 +7962,18 @@ key_delete( { struct sadb_sa *sa0; struct sadb_address *src0, *dst0; + ifnet_t ipsec_if = NULL; struct secasindex saidx; struct secashead *sah; struct secasvar *sav = NULL; u_int16_t proto; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); - + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); + /* sanity check */ - if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) + if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) { panic("key_delete: NULL pointer is passed.\n"); + } /* map satype to proto */ if ((proto = key_satype2proto(mhp->msg->sadb_msg_satype)) == 0) { @@ -6591,7 +7994,7 @@ key_delete( } lck_mtx_lock(sadb_mutex); - + if (mhp->ext[SADB_EXT_SA] == NULL) { /* * Caller wants us to delete all non-LARVAL SAs @@ -6600,7 +8003,7 @@ key_delete( */ ipseclog((LOG_DEBUG, "key_delete: doing delete all.\n")); /* key_delete_all will unlock sadb_mutex */ - return key_delete_all(so, m, mhp, proto); + return key_delete_all(so, m, mhp, proto); } else if (mhp->extlen[SADB_EXT_SA] < sizeof(struct sadb_sa)) { lck_mtx_unlock(sadb_mutex); ipseclog((LOG_DEBUG, "key_delete: invalid message is passed.\n")); @@ -6610,21 +8013,25 @@ key_delete( sa0 = (struct sadb_sa *)(void *)mhp->ext[SADB_EXT_SA]; 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); /* XXX boundary check against sa_len */ - KEY_SETSECASIDX(proto, IPSEC_MODE_ANY, 0, src0 + 1, dst0 + 1, &saidx); + KEY_SETSECASIDX(proto, IPSEC_MODE_ANY, 0, src0 + 1, dst0 + 1, ipsec_if ? ipsec_if->if_index : 0, &saidx); /* get a SA header */ LIST_FOREACH(sah, &sahtree, chain) { - if (sah->state == SADB_SASTATE_DEAD) + if (sah->state == SADB_SASTATE_DEAD) { continue; - if (key_cmpsaidx(&sah->saidx, &saidx, CMP_HEAD) == 0) + } + if (key_cmpsaidx(&sah->saidx, &saidx, CMP_HEAD) == 0) { continue; + } /* get a SA with SPI. */ sav = key_getsavbyspi(sah, sa0->sadb_sa_spi); - if (sav) + if (sav) { break; + } } if (sah == NULL) { lck_mtx_unlock(sadb_mutex); @@ -6634,33 +8041,35 @@ key_delete( key_sa_chgstate(sav, SADB_SASTATE_DEAD); key_freesav(sav, KEY_SADB_LOCKED); - + lck_mtx_unlock(sadb_mutex); sav = NULL; - { - struct mbuf *n; - struct sadb_msg *newmsg; - int mbufItems[] = {SADB_EXT_RESERVED, SADB_EXT_SA, - SADB_EXT_ADDRESS_SRC, SADB_EXT_ADDRESS_DST}; - - /* create new sadb_msg to reply. */ - n = key_gather_mbuf(m, mhp, 1, sizeof(mbufItems)/sizeof(int), mbufItems); - if (!n) - return key_senderror(so, m, ENOBUFS); + { + struct mbuf *n; + struct sadb_msg *newmsg; + int mbufItems[] = {SADB_EXT_RESERVED, SADB_EXT_SA, + SADB_EXT_ADDRESS_SRC, SADB_EXT_ADDRESS_DST}; - if (n->m_len < sizeof(struct sadb_msg)) { - n = m_pullup(n, sizeof(struct sadb_msg)); - if (n == NULL) + /* create new sadb_msg to reply. */ + n = key_gather_mbuf(m, mhp, 1, sizeof(mbufItems) / sizeof(int), mbufItems); + if (!n) { return key_senderror(so, m, ENOBUFS); - } - newmsg = mtod(n, struct sadb_msg *); - newmsg->sadb_msg_errno = 0; - newmsg->sadb_msg_len = PFKEY_UNIT64(n->m_pkthdr.len); + } - m_freem(m); - return key_sendup_mbuf(so, n, KEY_SENDUP_ALL); - } + if (n->m_len < sizeof(struct sadb_msg)) { + n = m_pullup(n, sizeof(struct sadb_msg)); + if (n == NULL) { + return key_senderror(so, m, ENOBUFS); + } + } + newmsg = mtod(n, struct sadb_msg *); + newmsg->sadb_msg_errno = 0; + newmsg->sadb_msg_len = PFKEY_UNIT64(n->m_pkthdr.len); + + m_freem(m); + return key_sendup_mbuf(so, n, KEY_SENDUP_ALL); + } } /* @@ -6674,74 +8083,81 @@ key_delete_all( u_int16_t proto) { struct sadb_address *src0, *dst0; + ifnet_t ipsec_if = NULL; struct secasindex saidx; struct secashead *sah; struct secasvar *sav, *nextsav; u_int stateidx, state; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED); + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); 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); /* XXX boundary check against sa_len */ - KEY_SETSECASIDX(proto, IPSEC_MODE_ANY, 0, src0 + 1, dst0 + 1, &saidx); + KEY_SETSECASIDX(proto, IPSEC_MODE_ANY, 0, src0 + 1, dst0 + 1, ipsec_if ? ipsec_if->if_index : 0, &saidx); LIST_FOREACH(sah, &sahtree, chain) { - if (sah->state == SADB_SASTATE_DEAD) + if (sah->state == SADB_SASTATE_DEAD) { continue; - if (key_cmpsaidx(&sah->saidx, &saidx, CMP_HEAD) == 0) + } + if (key_cmpsaidx(&sah->saidx, &saidx, CMP_HEAD) == 0) { continue; + } /* Delete all non-LARVAL SAs. */ for (stateidx = 0; - stateidx < _ARRAYLEN(saorder_state_alive); - stateidx++) { + stateidx < _ARRAYLEN(saorder_state_alive); + stateidx++) { state = saorder_state_alive[stateidx]; - if (state == SADB_SASTATE_LARVAL) + if (state == SADB_SASTATE_LARVAL) { continue; + } for (sav = LIST_FIRST(&sah->savtree[state]); - sav != NULL; sav = nextsav) { + sav != NULL; sav = nextsav) { nextsav = LIST_NEXT(sav, chain); /* sanity check */ if (sav->state != state) { ipseclog((LOG_DEBUG, "key_delete_all: " - "invalid sav->state " - "(queue: %d SA: %d)\n", - state, sav->state)); + "invalid sav->state " + "(queue: %d SA: %d)\n", + state, sav->state)); continue; } - + key_sa_chgstate(sav, SADB_SASTATE_DEAD); key_freesav(sav, KEY_SADB_LOCKED); } } } lck_mtx_unlock(sadb_mutex); - - { - struct mbuf *n; - struct sadb_msg *newmsg; - int mbufItems[] = {SADB_EXT_RESERVED, SADB_EXT_ADDRESS_SRC, - SADB_EXT_ADDRESS_DST}; - /* create new sadb_msg to reply. */ - n = key_gather_mbuf(m, mhp, 1, sizeof(mbufItems)/sizeof(int), mbufItems); - if (!n) - return key_senderror(so, m, ENOBUFS); + { + struct mbuf *n; + struct sadb_msg *newmsg; + int mbufItems[] = {SADB_EXT_RESERVED, SADB_EXT_ADDRESS_SRC, + SADB_EXT_ADDRESS_DST}; - if (n->m_len < sizeof(struct sadb_msg)) { - n = m_pullup(n, sizeof(struct sadb_msg)); - if (n == NULL) + /* create new sadb_msg to reply. */ + n = key_gather_mbuf(m, mhp, 1, sizeof(mbufItems) / sizeof(int), mbufItems); + if (!n) { return key_senderror(so, m, ENOBUFS); - } - newmsg = mtod(n, struct sadb_msg *); - newmsg->sadb_msg_errno = 0; - newmsg->sadb_msg_len = PFKEY_UNIT64(n->m_pkthdr.len); + } - m_freem(m); - return key_sendup_mbuf(so, n, KEY_SENDUP_ALL); - } + if (n->m_len < sizeof(struct sadb_msg)) { + n = m_pullup(n, sizeof(struct sadb_msg)); + if (n == NULL) { + return key_senderror(so, m, ENOBUFS); + } + } + newmsg = mtod(n, struct sadb_msg *); + newmsg->sadb_msg_errno = 0; + newmsg->sadb_msg_len = PFKEY_UNIT64(n->m_pkthdr.len); + + m_freem(m); + return key_sendup_mbuf(so, n, KEY_SENDUP_ALL); + } } /* @@ -6764,16 +8180,18 @@ key_get( { struct sadb_sa *sa0; struct sadb_address *src0, *dst0; + ifnet_t ipsec_if = NULL; struct secasindex saidx; struct secashead *sah; struct secasvar *sav = NULL; u_int16_t proto; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); - + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); + /* sanity check */ - if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) + if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) { panic("key_get: NULL pointer is passed.\n"); + } /* map satype to proto */ if ((proto = key_satype2proto(mhp->msg->sadb_msg_satype)) == 0) { @@ -6797,23 +8215,27 @@ key_get( sa0 = (struct sadb_sa *)(void *)mhp->ext[SADB_EXT_SA]; 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); /* XXX boundary check against sa_len */ - KEY_SETSECASIDX(proto, IPSEC_MODE_ANY, 0, src0 + 1, dst0 + 1, &saidx); + KEY_SETSECASIDX(proto, IPSEC_MODE_ANY, 0, src0 + 1, dst0 + 1, ipsec_if ? ipsec_if->if_index : 0, &saidx); lck_mtx_lock(sadb_mutex); - + /* get a SA header */ LIST_FOREACH(sah, &sahtree, chain) { - if (sah->state == SADB_SASTATE_DEAD) + if (sah->state == SADB_SASTATE_DEAD) { continue; - if (key_cmpsaidx(&sah->saidx, &saidx, CMP_HEAD) == 0) + } + if (key_cmpsaidx(&sah->saidx, &saidx, CMP_HEAD) == 0) { continue; + } /* get a SA with SPI. */ sav = key_getsavbyspi(sah, sa0->sadb_sa_spi); - if (sav) + if (sav) { break; + } } if (sah == NULL) { lck_mtx_unlock(sadb_mutex); @@ -6821,30 +8243,31 @@ key_get( return key_senderror(so, m, ENOENT); } - { - struct mbuf *n; - u_int8_t satype; + { + struct mbuf *n; + u_int8_t satype; - /* map proto to satype */ - if ((satype = key_proto2satype(sah->saidx.proto)) == 0) { + /* map proto to satype */ + if ((satype = key_proto2satype(sah->saidx.proto)) == 0) { + lck_mtx_unlock(sadb_mutex); + ipseclog((LOG_DEBUG, "key_get: there was invalid proto in SAD.\n")); + return key_senderror(so, m, EINVAL); + } lck_mtx_unlock(sadb_mutex); - ipseclog((LOG_DEBUG, "key_get: there was invalid proto in SAD.\n")); - return key_senderror(so, m, EINVAL); - } - lck_mtx_unlock(sadb_mutex); - /* create new sadb_msg to reply. */ - n = key_setdumpsa(sav, SADB_GET, satype, mhp->msg->sadb_msg_seq, - mhp->msg->sadb_msg_pid); - - - - if (!n) - return key_senderror(so, m, ENOBUFS); + /* create new sadb_msg to reply. */ + n = key_setdumpsa(sav, SADB_GET, satype, mhp->msg->sadb_msg_seq, + mhp->msg->sadb_msg_pid); - m_freem(m); - return key_sendup_mbuf(so, n, KEY_SENDUP_ONE); - } + + + if (!n) { + return key_senderror(so, m, ENOBUFS); + } + + m_freem(m); + return key_sendup_mbuf(so, n, KEY_SENDUP_ONE); + } } /* @@ -6853,32 +8276,33 @@ key_get( * 0 : found, arg pointer to a SA stats is updated. */ static int -key_getsastatbyspi_one (u_int32_t spi, - struct sastat *stat) +key_getsastatbyspi_one(u_int32_t spi, + struct sastat *stat) { struct secashead *sah; struct secasvar *sav = NULL; if ((void *)stat == NULL) { - return -1; + return -1; } lck_mtx_lock(sadb_mutex); - + /* get a SA header */ LIST_FOREACH(sah, &sahtree, chain) { - if (sah->state == SADB_SASTATE_DEAD) + if (sah->state == SADB_SASTATE_DEAD) { continue; + } /* get a SA with SPI. */ sav = key_getsavbyspi(sah, spi); if (sav) { - stat->spi = sav->spi; + stat->spi = sav->spi; stat->created = sav->created; if (sav->lft_c) { - bcopy(sav->lft_c,&stat->lft_c, sizeof(stat->lft_c)); + bcopy(sav->lft_c, &stat->lft_c, sizeof(stat->lft_c)); } else { - bzero(&stat->lft_c, sizeof(stat->lft_c)); + bzero(&stat->lft_c, sizeof(stat->lft_c)); } lck_mtx_unlock(sadb_mutex); return 0; @@ -6896,29 +8320,33 @@ key_getsastatbyspi_one (u_int32_t spi, * 0 : found, arg pointers to a SA stats and 'maximum stats' are updated. */ static int -key_getsastatbyspi (struct sastat *stat_arg, - u_int32_t max_stat_arg, - struct sastat *stat_res, - u_int32_t *max_stat_res) +key_getsastatbyspi(struct sastat *stat_arg, + u_int32_t max_stat_arg, + struct sastat *stat_res, + u_int32_t stat_res_size, + u_int32_t *max_stat_res) { - int cur, found = 0; + int cur, found = 0; if (stat_arg == NULL || - stat_res == NULL || + stat_res == NULL || max_stat_res == NULL) { - return -1; + return -1; } - for (cur = 0; cur < max_stat_arg; cur++) { - if (key_getsastatbyspi_one(stat_arg[cur].spi, - &stat_res[found]) == 0) { - found++; + u_int32_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++) { + if (key_getsastatbyspi_one(stat_arg[cur].spi, + &stat_res[found]) == 0) { + found++; } } *max_stat_res = found; if (found) { - return 0; + return 0; } return -1; } @@ -6928,14 +8356,13 @@ static void key_getcomb_setlifetime( struct sadb_comb *comb) { - comb->sadb_comb_soft_allocations = 1; comb->sadb_comb_hard_allocations = 1; comb->sadb_comb_soft_bytes = 0; comb->sadb_comb_hard_bytes = 0; - comb->sadb_comb_hard_addtime = 86400; /* 1 day */ + comb->sadb_comb_hard_addtime = 86400; /* 1 day */ comb->sadb_comb_soft_addtime = comb->sadb_comb_soft_addtime * 80 / 100; - comb->sadb_comb_soft_usetime = 28800; /* 8 hours */ + comb->sadb_comb_soft_usetime = 28800; /* 8 hours */ comb->sadb_comb_hard_usetime = comb->sadb_comb_hard_usetime * 80 / 100; } @@ -6958,22 +8385,26 @@ key_getcomb_esp(void) m = NULL; for (i = 1; i <= SADB_EALG_MAX; i++) { algo = esp_algorithm_lookup(i); - if (!algo) + if (!algo) { continue; + } - if (algo->keymax < ipsec_esp_keymin) + if (algo->keymax < ipsec_esp_keymin) { continue; - if (algo->keymin < ipsec_esp_keymin) + } + if (algo->keymin < ipsec_esp_keymin) { encmin = ipsec_esp_keymin; - else + } else { encmin = algo->keymin; + } - if (ipsec_esp_auth) + if (ipsec_esp_auth) { m = key_getcomb_ah(); - else { + } else { #if DIAGNOSTIC - if (l > MLEN) + if (l > MLEN) { panic("assumption failed in key_getcomb_esp"); + } #endif MGET(m, M_WAITOK, MT_DATA); if (m) { @@ -6983,15 +8414,18 @@ key_getcomb_esp(void) bzero(mtod(m, caddr_t), m->m_len); } } - if (!m) + if (!m) { goto fail; + } totlen = 0; - for (n = m; n; n = n->m_next) + for (n = m; n; n = n->m_next) { totlen += n->m_len; + } #if DIAGNOSTIC - if (totlen % l) + if (totlen % l) { panic("assumption failed in key_getcomb_esp"); + } #endif for (off = 0; off < totlen; off += l) { @@ -7009,17 +8443,19 @@ key_getcomb_esp(void) comb->sadb_comb_encrypt_maxbits = algo->keymax; } - if (!result) + if (!result) { result = m; - else + } else { m_cat(result, m); + } } return result; - fail: - if (result) +fail: + if (result) { m_freem(result); + } return NULL; } #endif @@ -7038,73 +8474,32 @@ key_getcomb_ah(void) const int l = PFKEY_ALIGN8(sizeof(struct sadb_comb)); m = NULL; - for (i = 1; i <= SADB_AALG_MAX; i++) { -#if 1 - /* we prefer HMAC algorithms, not old algorithms */ - if (i != SADB_AALG_SHA1HMAC && i != SADB_AALG_MD5HMAC) - continue; -#endif - algo = ah_algorithm_lookup(i); - if (!algo) - continue; - - if (algo->keymax < ipsec_ah_keymin) - continue; - if (algo->keymin < ipsec_ah_keymin) - keymin = ipsec_ah_keymin; - else - keymin = algo->keymin; - - if (!m) { -#if DIAGNOSTIC - if (l > MLEN) - panic("assumption failed in key_getcomb_ah"); -#endif - MGET(m, M_WAITOK, MT_DATA); - if (m) { - M_ALIGN(m, l); - m->m_len = l; - m->m_next = NULL; - } - } else - M_PREPEND(m, l, M_WAITOK); - if (!m) - return NULL; - - comb = mtod(m, struct sadb_comb *); - bzero(comb, sizeof(*comb)); - key_getcomb_setlifetime(comb); - comb->sadb_comb_auth = i; - comb->sadb_comb_auth_minbits = keymin; - comb->sadb_comb_auth_maxbits = algo->keymax; - } - - return m; -} - -/* - * not really an official behavior. discussed in pf_key@inner.net in Sep2000. - * XXX reorder combinations by preference - */ -static struct mbuf * -key_getcomb_ipcomp(void) -{ - struct sadb_comb *comb; - const struct ipcomp_algorithm *algo; - struct mbuf *m; - int i; - const int l = PFKEY_ALIGN8(sizeof(struct sadb_comb)); - - m = NULL; - for (i = 1; i <= SADB_X_CALG_MAX; i++) { - algo = ipcomp_algorithm_lookup(i); - if (!algo) + for (i = 1; i <= SADB_AALG_MAX; i++) { +#if 1 + /* we prefer HMAC algorithms, not old algorithms */ + if (i != SADB_AALG_SHA1HMAC && i != SADB_AALG_MD5HMAC) { + continue; + } +#endif + algo = ah_algorithm_lookup(i); + if (!algo) { continue; + } + + if (algo->keymax < ipsec_ah_keymin) { + continue; + } + if (algo->keymin < ipsec_ah_keymin) { + keymin = ipsec_ah_keymin; + } else { + keymin = algo->keymin; + } if (!m) { #if DIAGNOSTIC - if (l > MLEN) - panic("assumption failed in key_getcomb_ipcomp"); + if (l > MLEN) { + panic("assumption failed in key_getcomb_ah"); + } #endif MGET(m, M_WAITOK, MT_DATA); if (m) { @@ -7112,16 +8507,19 @@ key_getcomb_ipcomp(void) m->m_len = l; m->m_next = NULL; } - } else - M_PREPEND(m, l, M_WAITOK); - if (!m) + } else { + M_PREPEND(m, l, M_WAITOK, 1); + } + if (!m) { return NULL; + } comb = mtod(m, struct sadb_comb *); bzero(comb, sizeof(*comb)); key_getcomb_setlifetime(comb); - comb->sadb_comb_encrypt = i; - /* what should we set into sadb_comb_*_{min,max}bits? */ + comb->sadb_comb_auth = i; + comb->sadb_comb_auth_minbits = keymin; + comb->sadb_comb_auth_maxbits = algo->keymax; } return m; @@ -7141,7 +8539,7 @@ key_getprop( const int l = PFKEY_ALIGN8(sizeof(struct sadb_prop)); int totlen; - switch (saidx->proto) { + switch (saidx->proto) { #if IPSEC_ESP case IPPROTO_ESP: m = key_getcomb_esp(); @@ -7150,28 +8548,28 @@ key_getprop( case IPPROTO_AH: m = key_getcomb_ah(); break; - case IPPROTO_IPCOMP: - m = key_getcomb_ipcomp(); - break; default: return NULL; } - if (!m) + if (!m) { return NULL; - M_PREPEND(m, l, M_WAITOK); - if (!m) + } + M_PREPEND(m, l, M_WAITOK, 1); + if (!m) { return NULL; + } totlen = 0; - for (n = m; n; n = n->m_next) + for (n = m; n; n = n->m_next) { totlen += n->m_len; + } prop = mtod(m, struct sadb_prop *); bzero(prop, sizeof(*prop)); prop->sadb_prop_len = PFKEY_UNIT64(totlen); prop->sadb_prop_exttype = SADB_EXT_PROPOSAL; - prop->sadb_prop_replay = 32; /* XXX */ + prop->sadb_prop_replay = 32; /* XXX */ return m; } @@ -7189,8 +8587,6 @@ key_getprop( * * XXX x_policy is outside of RFC2367 (KAME extension). * XXX sensitivity is not supported. - * XXX for ipcomp, RFC2367 does not define how to fill in proposal. - * see comment for key_getcomb_ipcomp(). * * OUT: * 0 : succeed @@ -7209,13 +8605,15 @@ key_acquire( int error = -1; u_int32_t seq; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); - + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); + /* sanity check */ - if (saidx == NULL) + if (saidx == NULL) { panic("key_acquire: NULL pointer is passed.\n"); - if ((satype = key_proto2satype(saidx->proto)) == 0) + } + if ((satype = key_proto2satype(saidx->proto)) == 0) { panic("key_acquire: invalid proto is passed.\n"); + } #ifndef IPSEC_NONBLOCK_ACQUIRE /* @@ -7245,6 +8643,7 @@ key_acquire( /* add to acqtree */ LIST_INSERT_HEAD(&acqtree, newacq, chain); + key_start_timehandler(); } seq = newacq->seq; lck_mtx_unlock(sadb_mutex); @@ -7287,7 +8686,7 @@ key_acquire( } m_cat(result, m); } - + /* XXX identity (optional) */ #if 0 if (idexttype && fqdn) { @@ -7295,7 +8694,7 @@ key_acquire( struct sadb_ident *id; int fqdnlen; - fqdnlen = strlen(fqdn) + 1; /* +1 for terminating-NUL */ + 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)); @@ -7313,18 +8712,21 @@ key_acquire( if (userfqdn) { /* +1 for terminating-NUL */ userfqdnlen = strlen(userfqdn) + 1; - } else + } 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) + if (curproc && curproc->p_cred) { id->sadb_ident_id = curproc->p_cred->p_ruid; - if (userfqdn && userfqdnlen) + } + if (userfqdn && userfqdnlen) { bcopy(userfqdn, id + 1, userfqdnlen); + } p += sizeof(struct sadb_ident) + PFKEY_ALIGN8(userfqdnlen); } #endif @@ -7333,24 +8735,12 @@ key_acquire( /* create proposal/combination extension */ m = key_getprop(saidx); -#if 0 - /* - * spec conformant: always attach proposal/combination extension, - * the problem is that we have no way to attach it for ipcomp, - * due to the way sadb_comb is declared in RFC2367. - */ - if (!m) { - error = ENOBUFS; - goto fail; - } - m_cat(result, m); -#else /* * outside of spec; make proposal/combination extension optional. */ - if (m) + if (m) { m_cat(result, m); -#endif + } if ((result->m_flags & M_PKTHDR) == 0) { error = EINVAL; @@ -7366,17 +8756,19 @@ key_acquire( } result->m_pkthdr.len = 0; - for (m = result; m; m = m->m_next) + for (m = result; m; m = m->m_next) { result->m_pkthdr.len += m->m_len; + } mtod(result, struct sadb_msg *)->sadb_msg_len = PFKEY_UNIT64(result->m_pkthdr.len); return key_sendup_mbuf(NULL, result, KEY_SENDUP_REGISTERED); - fail: - if (result) +fail: + if (result) { m_freem(result); + } return error; } @@ -7394,7 +8786,7 @@ key_newacq( lck_mtx_unlock(sadb_mutex); KMALLOC_WAIT(newacq, struct secacq *, sizeof(struct secacq)); lck_mtx_lock(sadb_mutex); - if (newacq == NULL) { + if (newacq == NULL) { ipseclog((LOG_DEBUG, "key_newacq: No more memory.\n")); return NULL; } @@ -7417,11 +8809,12 @@ key_getacq( { struct secacq *acq; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED); + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); LIST_FOREACH(acq, &acqtree, chain) { - if (key_cmpsaidx(saidx, &acq->saidx, CMP_EXACTLY)) + if (key_cmpsaidx(saidx, &acq->saidx, CMP_EXACTLY)) { return acq; + } } return NULL; @@ -7433,11 +8826,12 @@ key_getacqbyseq( { struct secacq *acq; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED); + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); LIST_FOREACH(acq, &acqtree, chain) { - if (acq->seq == seq) + if (acq->seq == seq) { return acq; + } } return NULL; @@ -7479,11 +8873,12 @@ key_getspacq( { struct secspacq *acq; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED); + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); LIST_FOREACH(acq, &spacqtree, chain) { - if (key_cmpspidx_exactly(spidx, &acq->spidx)) + if (key_cmpspidx_exactly(spidx, &acq->spidx)) { return acq; + } } return NULL; @@ -7510,6 +8905,7 @@ key_acquire2( const struct sadb_msghdr *mhp) { const struct sadb_address *src0, *dst0; + ifnet_t ipsec_if = NULL; struct secasindex saidx; struct secashead *sah; u_int16_t proto; @@ -7517,8 +8913,9 @@ key_acquire2( /* sanity check */ - if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) + if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) { panic("key_acquire2: NULL pointer is passed.\n"); + } /* * Error message from KMd. @@ -7526,7 +8923,7 @@ key_acquire2( * message is equal to the size of sadb_msg structure. * We do not raise error even if error occurred in this function. */ - lck_mtx_lock(sadb_mutex); + lck_mtx_lock(sadb_mutex); if (mhp->msg->sadb_msg_len == PFKEY_UNIT64(sizeof(struct sadb_msg))) { #ifndef IPSEC_NONBLOCK_ACQUIRE @@ -7591,17 +8988,20 @@ key_acquire2( src0 = (const struct sadb_address *)mhp->ext[SADB_EXT_ADDRESS_SRC]; dst0 = (const struct sadb_address *)mhp->ext[SADB_EXT_ADDRESS_DST]; + ipsec_if = key_get_ipsec_if_from_message(mhp, SADB_X_EXT_IPSECIF); /* XXX boundary check against sa_len */ /* cast warnings */ - KEY_SETSECASIDX(proto, IPSEC_MODE_ANY, 0, src0 + 1, dst0 + 1, &saidx); + KEY_SETSECASIDX(proto, IPSEC_MODE_ANY, 0, src0 + 1, dst0 + 1, ipsec_if ? ipsec_if->if_index : 0, &saidx); /* get a SA index */ LIST_FOREACH(sah, &sahtree, chain) { - if (sah->state == SADB_SASTATE_DEAD) + if (sah->state == SADB_SASTATE_DEAD) { continue; - if (key_cmpsaidx(&sah->saidx, &saidx, CMP_MODE | CMP_REQID)) + } + if (key_cmpsaidx(&sah->saidx, &saidx, CMP_MODE | CMP_REQID)) { break; + } } if (sah != NULL) { lck_mtx_unlock(sadb_mutex); @@ -7612,7 +9012,7 @@ key_acquire2( error = key_acquire(&saidx, NULL); if (error != 0) { ipseclog((LOG_DEBUG, "key_acquire2: error %d returned " - "from key_acquire.\n", mhp->msg->sadb_msg_errno)); + "from key_acquire.\n", mhp->msg->sadb_msg_errno)); return key_senderror(so, m, error); } @@ -7639,26 +9039,29 @@ key_register( const struct sadb_msghdr *mhp) { struct secreg *reg, *newreg = 0; - + /* sanity check */ - if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) + if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) { panic("key_register: NULL pointer is passed.\n"); + } /* check for invalid register message */ - if (mhp->msg->sadb_msg_satype >= sizeof(regtree)/sizeof(regtree[0])) + if (mhp->msg->sadb_msg_satype >= sizeof(regtree) / sizeof(regtree[0])) { return key_senderror(so, m, EINVAL); + } /* When SATYPE_UNSPEC is specified, only return sadb_supported. */ - if (mhp->msg->sadb_msg_satype == SADB_SATYPE_UNSPEC) + if (mhp->msg->sadb_msg_satype == SADB_SATYPE_UNSPEC) { goto setmsg; + } /* create regnode */ KMALLOC_WAIT(newreg, struct secreg *, sizeof(*newreg)); - if (newreg == NULL) { - ipseclog((LOG_DEBUG, "key_register: No more memory.\n")); - return key_senderror(so, m, ENOBUFS); - } - bzero((caddr_t)newreg, sizeof(*newreg)); + if (newreg == NULL) { + ipseclog((LOG_DEBUG, "key_register: No more memory.\n")); + return key_senderror(so, m, ENOBUFS); + } + bzero((caddr_t)newreg, sizeof(*newreg)); lck_mtx_lock(sadb_mutex); /* check whether existing or not */ @@ -7679,124 +9082,160 @@ key_register( /* add regnode to regtree. */ LIST_INSERT_HEAD(®tree[mhp->msg->sadb_msg_satype], newreg, chain); lck_mtx_unlock(sadb_mutex); - setmsg: - { - struct mbuf *n; - struct sadb_msg *newmsg; - struct sadb_supported *sup; - u_int len, alen, elen; - int off; - int i; - struct sadb_alg *alg; - - /* create new sadb_msg to reply. */ - alen = 0; - for (i = 1; i <= SADB_AALG_MAX; i++) { - if (ah_algorithm_lookup(i)) - alen += sizeof(struct sadb_alg); - } - if (alen) - alen += sizeof(struct sadb_supported); - elen = 0; +setmsg: + { + struct mbuf *n; + struct sadb_msg *newmsg; + struct sadb_supported *sup; + u_int len, alen, elen; + int off; + int i; + struct sadb_alg *alg; + + /* create new sadb_msg to reply. */ + alen = 0; + for (i = 1; i <= SADB_AALG_MAX; i++) { + if (ah_algorithm_lookup(i)) { + alen += sizeof(struct sadb_alg); + } + } + if (alen) { + alen += sizeof(struct sadb_supported); + } + elen = 0; #if IPSEC_ESP - for (i = 1; i <= SADB_EALG_MAX; i++) { - if (esp_algorithm_lookup(i)) - elen += sizeof(struct sadb_alg); - } - if (elen) - elen += sizeof(struct sadb_supported); + for (i = 1; i <= SADB_EALG_MAX; i++) { + if (esp_algorithm_lookup(i)) { + elen += sizeof(struct sadb_alg); + } + } + if (elen) { + elen += sizeof(struct sadb_supported); + } #endif - len = sizeof(struct sadb_msg) + alen + elen; + len = sizeof(struct sadb_msg) + alen + elen; - if (len > MCLBYTES) - return key_senderror(so, m, ENOBUFS); - - MGETHDR(n, M_WAITOK, MT_DATA); - if (n && len > MHLEN) { - MCLGET(n, M_WAITOK); - if ((n->m_flags & M_EXT) == 0) { - m_freem(n); - n = NULL; + if (len > MCLBYTES) { + return key_senderror(so, m, ENOBUFS); } - } - if (!n) - return key_senderror(so, m, ENOBUFS); - - n->m_pkthdr.len = n->m_len = len; - n->m_next = NULL; - off = 0; - - 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); - 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_exttype = SADB_EXT_SUPPORTED_AUTH; - off += PFKEY_ALIGN8(sizeof(*sup)); - for (i = 1; i <= SADB_AALG_MAX; i++) { - const struct ah_algorithm *aalgo; + MGETHDR(n, M_WAITOK, MT_DATA); + if (n && len > MHLEN) { + MCLGET(n, M_WAITOK); + if ((n->m_flags & M_EXT) == 0) { + m_freem(n); + n = NULL; + } + } + if (!n) { + return key_senderror(so, m, ENOBUFS); + } - aalgo = ah_algorithm_lookup(i); - if (!aalgo) - continue; - alg = (struct sadb_alg *) - (void *)(mtod(n, caddr_t) + off); - alg->sadb_alg_id = i; - alg->sadb_alg_ivlen = 0; - alg->sadb_alg_minbits = aalgo->keymin; - alg->sadb_alg_maxbits = aalgo->keymax; - off += PFKEY_ALIGN8(sizeof(*alg)); + n->m_pkthdr.len = n->m_len = len; + n->m_next = NULL; + off = 0; + + 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); + 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_exttype = SADB_EXT_SUPPORTED_AUTH; + off += PFKEY_ALIGN8(sizeof(*sup)); + + for (i = 1; i <= SADB_AALG_MAX; i++) { + const struct ah_algorithm *aalgo; + + aalgo = ah_algorithm_lookup(i); + if (!aalgo) { + continue; + } + alg = (struct sadb_alg *) + (void *)(mtod(n, caddr_t) + off); + alg->sadb_alg_id = i; + alg->sadb_alg_ivlen = 0; + alg->sadb_alg_minbits = aalgo->keymin; + alg->sadb_alg_maxbits = aalgo->keymax; + off += PFKEY_ALIGN8(sizeof(*alg)); + } } - } #if IPSEC_ESP - /* for encryption algorithm */ - if (elen) { - sup = (struct sadb_supported *)(void *)(mtod(n, caddr_t) + off); - sup->sadb_supported_len = PFKEY_UNIT64(elen); - sup->sadb_supported_exttype = SADB_EXT_SUPPORTED_ENCRYPT; - off += PFKEY_ALIGN8(sizeof(*sup)); - - for (i = 1; i <= SADB_EALG_MAX; i++) { - const struct esp_algorithm *ealgo; - - ealgo = esp_algorithm_lookup(i); - if (!ealgo) - continue; - alg = (struct sadb_alg *) - (void *)(mtod(n, caddr_t) + off); - alg->sadb_alg_id = i; - if (ealgo && ealgo->ivlen) { - /* - * give NULL to get the value preferred by - * algorithm XXX SADB_X_EXT_DERIV ? - */ - alg->sadb_alg_ivlen = - (*ealgo->ivlen)(ealgo, NULL); - } else - alg->sadb_alg_ivlen = 0; - alg->sadb_alg_minbits = ealgo->keymin; - alg->sadb_alg_maxbits = ealgo->keymax; - off += PFKEY_ALIGN8(sizeof(struct sadb_alg)); + /* for encryption algorithm */ + if (elen) { + sup = (struct sadb_supported *)(void *)(mtod(n, caddr_t) + off); + sup->sadb_supported_len = PFKEY_UNIT64(elen); + sup->sadb_supported_exttype = SADB_EXT_SUPPORTED_ENCRYPT; + off += PFKEY_ALIGN8(sizeof(*sup)); + + for (i = 1; i <= SADB_EALG_MAX; i++) { + const struct esp_algorithm *ealgo; + + ealgo = esp_algorithm_lookup(i); + if (!ealgo) { + continue; + } + alg = (struct sadb_alg *) + (void *)(mtod(n, caddr_t) + off); + alg->sadb_alg_id = i; + if (ealgo && ealgo->ivlen) { + /* + * give NULL to get the value preferred by + * algorithm XXX SADB_X_EXT_DERIV ? + */ + alg->sadb_alg_ivlen = + (*ealgo->ivlen)(ealgo, NULL); + } else { + alg->sadb_alg_ivlen = 0; + } + alg->sadb_alg_minbits = ealgo->keymin; + alg->sadb_alg_maxbits = ealgo->keymax; + off += PFKEY_ALIGN8(sizeof(struct sadb_alg)); + } } - } #endif -#if DIGAGNOSTIC - if (off != len) - panic("length assumption failed in key_register"); +#if DIAGNOSTIC + if (off != len) { + panic("length assumption failed in key_register"); + } #endif - m_freem(m); - return key_sendup_mbuf(so, n, KEY_SENDUP_REGISTERED); - } + m_freem(m); + return key_sendup_mbuf(so, n, KEY_SENDUP_REGISTERED); + } +} + +static void +key_delete_all_for_socket(struct socket *so) +{ + struct secashead *sah, *nextsah; + struct secasvar *sav, *nextsav; + u_int stateidx; + u_int state; + + for (sah = LIST_FIRST(&sahtree); + sah != NULL; + sah = nextsah) { + nextsah = LIST_NEXT(sah, chain); + for (stateidx = 0; stateidx < _ARRAYLEN(saorder_state_alive); stateidx++) { + state = saorder_state_any[stateidx]; + for (sav = LIST_FIRST(&sah->savtree[state]); sav != NULL; sav = nextsav) { + nextsav = LIST_NEXT(sav, chain); + if (sav->flags2 & SADB_X_EXT_SA2_DELETE_ON_DETACH && + sav->so == so) { + key_sa_chgstate(sav, SADB_SASTATE_DEAD); + key_freesav(sav, KEY_SADB_LOCKED); + } + } + } + } } /* @@ -7809,10 +9248,11 @@ key_freereg( { struct secreg *reg; int i; - + /* sanity check */ - if (so == NULL) + if (so == NULL) { panic("key_freereg: NULL pointer is passed.\n"); + } /* * check whether existing or not. @@ -7820,10 +9260,11 @@ key_freereg( * one socket is registered to multiple type of SA. */ lck_mtx_lock(sadb_mutex); + key_delete_all_for_socket(so); for (i = 0; i <= SADB_SATYPE_MAX; i++) { LIST_FOREACH(reg, ®tree[i], chain) { if (reg->so == so - && __LIST_CHAINED(reg)) { + && __LIST_CHAINED(reg)) { LIST_REMOVE(reg, chain); KFREE(reg); break; @@ -7854,15 +9295,18 @@ key_expire( int error = -1; struct sadb_lifetime *lt; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); - + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); + /* sanity check */ - if (sav == NULL) + if (sav == NULL) { panic("key_expire: NULL pointer is passed.\n"); - if (sav->sah == NULL) + } + if (sav->sah == NULL) { panic("key_expire: Why was SA index in SA NULL.\n"); - if ((satype = key_proto2satype(sav->sah->saidx.proto)) == 0) + } + if ((satype = key_proto2satype(sav->sah->saidx.proto)) == 0) { panic("key_expire: invalid proto is passed.\n"); + } /* set msg header */ m = key_setsadbmsg(SADB_EXPIRE, 0, satype, sav->seq, 0, sav->refcnt); @@ -7882,8 +9326,9 @@ key_expire( /* create SA extension */ m = key_setsadbxsa2(sav->sah->saidx.mode, - sav->replay ? sav->replay->count : 0, - sav->sah->saidx.reqid); + sav->replay[0] ? sav->replay[0]->count : 0, + sav->sah->saidx.reqid, + sav->flags2); if (!m) { error = ENOBUFS; goto fail; @@ -7893,9 +9338,10 @@ key_expire( /* create lifetime extension (current and soft) */ len = PFKEY_ALIGN8(sizeof(*lt)) * 2; m = key_alloc_mbuf(len); - if (!m || m->m_next) { /*XXX*/ - if (m) + if (!m || m->m_next) { /*XXX*/ + if (m) { m_freem(m); + } error = ENOBUFS; goto fail; } @@ -7945,17 +9391,19 @@ key_expire( } result->m_pkthdr.len = 0; - for (m = result; m; m = m->m_next) + for (m = result; m; m = m->m_next) { result->m_pkthdr.len += m->m_len; + } mtod(result, struct sadb_msg *)->sadb_msg_len = PFKEY_UNIT64(result->m_pkthdr.len); return key_sendup_mbuf(NULL, result, KEY_SENDUP_REGISTERED); - fail: - if (result) +fail: + if (result) { m_freem(result); + } return error; } @@ -7983,10 +9431,11 @@ key_flush( u_int16_t proto; u_int8_t state; u_int stateidx; - + /* sanity check */ - if (so == NULL || mhp == NULL || mhp->msg == NULL) + if (so == NULL || mhp == NULL || mhp->msg == NULL) { panic("key_flush: NULL pointer is passed.\n"); + } /* map satype to proto */ if ((proto = key_satype2proto(mhp->msg->sadb_msg_satype)) == 0) { @@ -7995,25 +9444,25 @@ key_flush( } lck_mtx_lock(sadb_mutex); - + /* no SATYPE specified, i.e. flushing all SA. */ for (sah = LIST_FIRST(&sahtree); - sah != NULL; - sah = nextsah) { + sah != NULL; + sah = nextsah) { nextsah = LIST_NEXT(sah, chain); if (mhp->msg->sadb_msg_satype != SADB_SATYPE_UNSPEC - && proto != sah->saidx.proto) + && proto != sah->saidx.proto) { continue; + } for (stateidx = 0; - stateidx < _ARRAYLEN(saorder_state_alive); - stateidx++) { + stateidx < _ARRAYLEN(saorder_state_alive); + stateidx++) { state = saorder_state_any[stateidx]; for (sav = LIST_FIRST(&sah->savtree[state]); - sav != NULL; - sav = nextsav) { - + sav != NULL; + sav = nextsav) { nextsav = LIST_NEXT(sav, chain); key_sa_chgstate(sav, SADB_SASTATE_DEAD); @@ -8024,15 +9473,16 @@ key_flush( sah->state = SADB_SASTATE_DEAD; } lck_mtx_unlock(sadb_mutex); - + if (m->m_len < sizeof(struct sadb_msg) || sizeof(struct sadb_msg) > m->m_len + M_TRAILINGSPACE(m)) { ipseclog((LOG_DEBUG, "key_flush: No more memory.\n")); return key_senderror(so, m, ENOBUFS); } - if (m->m_next) + if (m->m_next) { m_freem(m->m_next); + } m->m_next = NULL; m->m_pkthdr.len = m->m_len = sizeof(struct sadb_msg); newmsg = mtod(m, struct sadb_msg *); @@ -8054,7 +9504,7 @@ key_flush( * * m will always be freed. */ - + struct sav_dump_elem { struct secasvar *sav; u_int8_t satype; @@ -8077,11 +9527,12 @@ key_dump( struct mbuf *n; int error = 0; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); - + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); + /* sanity check */ - if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) + if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) { panic("key_dump: NULL pointer is passed.\n"); + } /* map satype to proto */ if ((proto = key_satype2proto(mhp->msg->sadb_msg_satype)) == 0) { @@ -8093,7 +9544,7 @@ key_dump( error = ENOENT; goto end; } - bufcount += 512; /* extra */ + bufcount += 512; /* extra */ KMALLOC_WAIT(savbuf, struct sav_dump_elem*, bufcount * sizeof(struct sav_dump_elem)); if (savbuf == NULL) { ipseclog((LOG_DEBUG, "key_dump: No more memory.\n")); @@ -8106,9 +9557,10 @@ key_dump( elem_ptr = savbuf; LIST_FOREACH(sah, &sahtree, chain) { if (mhp->msg->sadb_msg_satype != SADB_SATYPE_UNSPEC - && proto != sah->saidx.proto) + && proto != sah->saidx.proto) { continue; - + } + /* map proto to satype */ if ((satype = key_proto2satype(sah->saidx.proto)) == 0) { lck_mtx_unlock(sadb_mutex); @@ -8118,17 +9570,18 @@ key_dump( } for (stateidx = 0; - stateidx < _ARRAYLEN(saorder_state_any); - stateidx++) { + stateidx < _ARRAYLEN(saorder_state_any); + stateidx++) { state = saorder_state_any[stateidx]; LIST_FOREACH(sav, &sah->savtree[state], chain) { - if (cnt == bufcount) - break; /* out of buffer space */ + if (cnt == bufcount) { + break; /* out of buffer space */ + } elem_ptr->sav = sav; elem_ptr->satype = satype; sav->refcnt++; elem_ptr++; - cnt++; + cnt++; } } } @@ -8144,8 +9597,8 @@ key_dump( cnt2 = cnt; while (cnt2) { n = key_setdumpsa(elem_ptr->sav, SADB_DUMP, elem_ptr->satype, - --cnt2, mhp->msg->sadb_msg_pid); - + --cnt2, mhp->msg->sadb_msg_pid); + if (!n) { error = ENOBUFS; goto end; @@ -8160,15 +9613,17 @@ end: if (cnt) { elem_ptr = savbuf; lck_mtx_lock(sadb_mutex); - while (cnt--) + while (cnt--) { key_freesav((elem_ptr++)->sav, KEY_SADB_LOCKED); + } lck_mtx_unlock(sadb_mutex); } KFREE(savbuf); } - if (error) + if (error) { return key_senderror(so, m, error); + } m_freem(m); return 0; @@ -8186,10 +9641,11 @@ key_promisc( const struct sadb_msghdr *mhp) { int olen; - + /* sanity check */ - if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) + if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) { panic("key_promisc: NULL pointer is passed.\n"); + } olen = PFKEY_UNUNIT64(mhp->msg->sadb_msg_len); @@ -8203,10 +9659,11 @@ key_promisc( } else if (olen == sizeof(struct sadb_msg)) { /* enable/disable promisc mode */ struct keycb *kp; - + socket_lock(so, 1); - if ((kp = (struct keycb *)sotorawcb(so)) == NULL) + if ((kp = (struct keycb *)sotorawcb(so)) == NULL) { return key_senderror(so, m, EINVAL); + } mhp->msg->sadb_msg_errno = 0; switch (mhp->msg->sadb_msg_satype) { case 0: @@ -8232,34 +9689,173 @@ key_promisc( } } -static int (*key_typesw[])(struct socket *, struct mbuf *, - const struct sadb_msghdr *) = { - NULL, /* SADB_RESERVED */ - key_getspi, /* SADB_GETSPI */ - key_update, /* SADB_UPDATE */ - key_add, /* SADB_ADD */ - key_delete, /* SADB_DELETE */ - key_get, /* SADB_GET */ - key_acquire2, /* SADB_ACQUIRE */ - key_register, /* SADB_REGISTER */ - NULL, /* SADB_EXPIRE */ - key_flush, /* SADB_FLUSH */ - key_dump, /* SADB_DUMP */ - key_promisc, /* SADB_X_PROMISC */ - NULL, /* SADB_X_PCHANGE */ - key_spdadd, /* SADB_X_SPDUPDATE */ - key_spdadd, /* SADB_X_SPDADD */ - key_spddelete, /* SADB_X_SPDDELETE */ - key_spdget, /* SADB_X_SPDGET */ - NULL, /* SADB_X_SPDACQUIRE */ - key_spddump, /* SADB_X_SPDDUMP */ - key_spdflush, /* SADB_X_SPDFLUSH */ - key_spdadd, /* SADB_X_SPDSETIDX */ - NULL, /* SADB_X_SPDEXPIRE */ - key_spddelete2, /* SADB_X_SPDDELETE2 */ +static int(*const key_typesw[])(struct socket *, struct mbuf *, + const struct sadb_msghdr *) = { + NULL, /* SADB_RESERVED */ + key_getspi, /* SADB_GETSPI */ + key_update, /* SADB_UPDATE */ + key_add, /* SADB_ADD */ + key_delete, /* SADB_DELETE */ + key_get, /* SADB_GET */ + key_acquire2, /* SADB_ACQUIRE */ + key_register, /* SADB_REGISTER */ + NULL, /* SADB_EXPIRE */ + key_flush, /* SADB_FLUSH */ + key_dump, /* SADB_DUMP */ + key_promisc, /* SADB_X_PROMISC */ + NULL, /* SADB_X_PCHANGE */ + key_spdadd, /* SADB_X_SPDUPDATE */ + key_spdadd, /* SADB_X_SPDADD */ + key_spddelete, /* SADB_X_SPDDELETE */ + key_spdget, /* SADB_X_SPDGET */ + NULL, /* SADB_X_SPDACQUIRE */ + key_spddump, /* SADB_X_SPDDUMP */ + key_spdflush, /* SADB_X_SPDFLUSH */ + key_spdadd, /* SADB_X_SPDSETIDX */ + NULL, /* SADB_X_SPDEXPIRE */ + key_spddelete2, /* SADB_X_SPDDELETE2 */ key_getsastat, /* SADB_GETSASTAT */ + key_spdenable, /* SADB_X_SPDENABLE */ + key_spddisable, /* SADB_X_SPDDISABLE */ + key_migrate, /* SADB_MIGRATE */ }; +static void +bzero_mbuf(struct mbuf *m) +{ + struct mbuf *mptr = m; + struct sadb_msg *msg = NULL; + int offset = 0; + + if (!mptr) { + return; + } + + if (mptr->m_len >= sizeof(struct sadb_msg)) { + msg = mtod(mptr, struct sadb_msg *); + if (msg->sadb_msg_type != SADB_ADD && + msg->sadb_msg_type != SADB_UPDATE) { + return; + } + offset = sizeof(struct sadb_msg); + } + bzero(mptr->m_data + offset, mptr->m_len - offset); + mptr = mptr->m_next; + while (mptr != NULL) { + bzero(mptr->m_data, mptr->m_len); + mptr = mptr->m_next; + } +} + +static void +bzero_keys(const struct sadb_msghdr *mh) +{ + int extlen = 0; + int offset = 0; + + if (!mh) { + return; + } + offset = sizeof(struct sadb_key); + + if (mh->ext[SADB_EXT_KEY_ENCRYPT]) { + struct sadb_key *key = (struct sadb_key*)mh->ext[SADB_EXT_KEY_ENCRYPT]; + extlen = key->sadb_key_bits >> 3; + + if (mh->extlen[SADB_EXT_KEY_ENCRYPT] >= offset + extlen) { + bzero((uint8_t *)mh->ext[SADB_EXT_KEY_ENCRYPT] + offset, extlen); + } else { + bzero(mh->ext[SADB_EXT_KEY_ENCRYPT], mh->extlen[SADB_EXT_KEY_ENCRYPT]); + } + } + if (mh->ext[SADB_EXT_KEY_AUTH]) { + struct sadb_key *key = (struct sadb_key*)mh->ext[SADB_EXT_KEY_AUTH]; + extlen = key->sadb_key_bits >> 3; + + if (mh->extlen[SADB_EXT_KEY_AUTH] >= offset + extlen) { + bzero((uint8_t *)mh->ext[SADB_EXT_KEY_AUTH] + offset, extlen); + } else { + bzero(mh->ext[SADB_EXT_KEY_AUTH], mh->extlen[SADB_EXT_KEY_AUTH]); + } + } +} + +static int +key_validate_address_pair(struct sadb_address *src0, + struct sadb_address *dst0) +{ + u_int plen = 0; + + /* check upper layer protocol */ + if (src0->sadb_address_proto != dst0->sadb_address_proto) { + ipseclog((LOG_DEBUG, "key_parse: upper layer protocol mismatched.\n")); + PFKEY_STAT_INCREMENT(pfkeystat.out_invaddr); + return EINVAL; + } + + /* check family */ + if (PFKEY_ADDR_SADDR(src0)->sa_family != + PFKEY_ADDR_SADDR(dst0)->sa_family) { + ipseclog((LOG_DEBUG, "key_parse: address family mismatched.\n")); + PFKEY_STAT_INCREMENT(pfkeystat.out_invaddr); + return EINVAL; + } + if (PFKEY_ADDR_SADDR(src0)->sa_len != + PFKEY_ADDR_SADDR(dst0)->sa_len) { + ipseclog((LOG_DEBUG, + "key_parse: address struct size mismatched.\n")); + PFKEY_STAT_INCREMENT(pfkeystat.out_invaddr); + return EINVAL; + } + + switch (PFKEY_ADDR_SADDR(src0)->sa_family) { + case AF_INET: + if (PFKEY_ADDR_SADDR(src0)->sa_len != sizeof(struct sockaddr_in)) { + PFKEY_STAT_INCREMENT(pfkeystat.out_invaddr); + return EINVAL; + } + break; + case AF_INET6: + if (PFKEY_ADDR_SADDR(src0)->sa_len != sizeof(struct sockaddr_in6)) { + PFKEY_STAT_INCREMENT(pfkeystat.out_invaddr); + return EINVAL; + } + break; + default: + ipseclog((LOG_DEBUG, + "key_parse: unsupported address family.\n")); + PFKEY_STAT_INCREMENT(pfkeystat.out_invaddr); + return EAFNOSUPPORT; + } + + switch (PFKEY_ADDR_SADDR(src0)->sa_family) { + case AF_INET: + plen = sizeof(struct in_addr) << 3; + break; + case AF_INET6: + plen = sizeof(struct in6_addr) << 3; + break; + default: + plen = 0; /*fool gcc*/ + break; + } + + /* check max prefix length */ + if (src0->sadb_address_prefixlen > plen || + dst0->sadb_address_prefixlen > plen) { + ipseclog((LOG_DEBUG, + "key_parse: illegal prefixlen.\n")); + PFKEY_STAT_INCREMENT(pfkeystat.out_invaddr); + return EINVAL; + } + + /* + * prefixlen == 0 is valid because there can be a case when + * all addresses are matched. + */ + return 0; +} + /* * parse sadb_msg buffer to process PFKEYv2, * and create a data to response if needed. @@ -8281,30 +9877,33 @@ key_parse( u_int orglen; int error; int target; + Boolean keyAligned = FALSE; + + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); - /* sanity check */ - if (m == NULL || so == NULL) + if (m == NULL || so == NULL) { panic("key_parse: NULL pointer is passed.\n"); + } -#if 0 /*kdebug_sadb assumes msg in linear buffer*/ +#if 0 /*kdebug_sadb assumes msg in linear buffer*/ KEYDEBUG(KEYDEBUG_KEY_DUMP, - ipseclog((LOG_DEBUG, "key_parse: passed sadb_msg\n")); - kdebug_sadb(msg)); + ipseclog((LOG_DEBUG, "key_parse: passed sadb_msg\n")); + kdebug_sadb(msg)); #endif if (m->m_len < sizeof(struct sadb_msg)) { m = m_pullup(m, sizeof(struct sadb_msg)); - if (!m) + if (!m) { return ENOBUFS; + } } msg = mtod(m, struct sadb_msg *); orglen = PFKEY_UNUNIT64(msg->sadb_msg_len); target = KEY_SENDUP_ONE; if ((m->m_flags & M_PKTHDR) == 0 || - m->m_pkthdr.len != m->m_pkthdr.len) { + m->m_pkthdr.len != orglen) { ipseclog((LOG_DEBUG, "key_parse: invalid message length.\n")); PFKEY_STAT_INCREMENT(pfkeystat.out_invlen); error = EINVAL; @@ -8345,26 +9944,31 @@ key_parse( } } if (!n) { + bzero_mbuf(m); m_freem(m); return ENOBUFS; } m_copydata(m, 0, m->m_pkthdr.len, mtod(n, caddr_t)); n->m_pkthdr.len = n->m_len = m->m_pkthdr.len; n->m_next = NULL; + bzero_mbuf(m); m_freem(m); m = n; } /* align the mbuf chain so that extensions are in contiguous region. */ error = key_align(m, &mh); - if (error) + if (error) { return error; + } - if (m->m_next) { /*XXX*/ + if (m->m_next) { /*XXX*/ + bzero_mbuf(m); m_freem(m); return ENOBUFS; } + keyAligned = TRUE; msg = mh.msg; /* check SA type */ @@ -8387,7 +9991,6 @@ key_parse( break; case SADB_SATYPE_AH: case SADB_SATYPE_ESP: - case SADB_X_SATYPE_IPCOMP: switch (msg->sadb_msg_type) { case SADB_X_SPDADD: case SADB_X_SPDDELETE: @@ -8397,6 +10000,8 @@ key_parse( case SADB_X_SPDSETIDX: case SADB_X_SPDUPDATE: case SADB_X_SPDDELETE2: + case SADB_X_SPDENABLE: + case SADB_X_SPDDISABLE: ipseclog((LOG_DEBUG, "key_parse: illegal satype=%u\n", msg->sadb_msg_type)); PFKEY_STAT_INCREMENT(pfkeystat.out_invsatype); @@ -8413,10 +10018,11 @@ key_parse( PFKEY_STAT_INCREMENT(pfkeystat.out_invsatype); error = EOPNOTSUPP; goto senderror; - case 1: /* XXX: What does it do? */ - if (msg->sadb_msg_type == SADB_X_PROMISC) + case 1: /* XXX: What does it do? */ + if (msg->sadb_msg_type == SADB_X_PROMISC) { break; - /*FALLTHROUGH*/ + } + /*FALLTHROUGH*/ default: ipseclog((LOG_DEBUG, "key_parse: invalid type %u is passed.\n", msg->sadb_msg_satype)); @@ -8425,103 +10031,58 @@ key_parse( goto senderror; } - /* check field of upper layer protocol and address family */ - if (mh.ext[SADB_EXT_ADDRESS_SRC] != NULL - && mh.ext[SADB_EXT_ADDRESS_DST] != NULL) { - struct sadb_address *src0, *dst0; - u_int plen; - - src0 = (struct sadb_address *)(mh.ext[SADB_EXT_ADDRESS_SRC]); - dst0 = (struct sadb_address *)(mh.ext[SADB_EXT_ADDRESS_DST]); - - /* check upper layer protocol */ - if (src0->sadb_address_proto != dst0->sadb_address_proto) { - ipseclog((LOG_DEBUG, "key_parse: upper layer protocol mismatched.\n")); - PFKEY_STAT_INCREMENT(pfkeystat.out_invaddr); - error = EINVAL; + /* Validate address fields for matching families, lengths, etc. */ + void *src0 = mh.ext[SADB_EXT_ADDRESS_SRC]; + void *dst0 = mh.ext[SADB_EXT_ADDRESS_DST]; + if (mh.ext[SADB_X_EXT_ADDR_RANGE_SRC_START] != NULL && + mh.ext[SADB_X_EXT_ADDR_RANGE_SRC_END] != NULL) { + error = key_validate_address_pair((struct sadb_address *)(mh.ext[SADB_X_EXT_ADDR_RANGE_SRC_START]), + (struct sadb_address *)(mh.ext[SADB_X_EXT_ADDR_RANGE_SRC_END])); + if (error != 0) { goto senderror; } - /* check family */ - if (PFKEY_ADDR_SADDR(src0)->sa_family != - PFKEY_ADDR_SADDR(dst0)->sa_family) { - ipseclog((LOG_DEBUG, "key_parse: address family mismatched.\n")); - PFKEY_STAT_INCREMENT(pfkeystat.out_invaddr); - error = EINVAL; - goto senderror; - } - if (PFKEY_ADDR_SADDR(src0)->sa_len != - PFKEY_ADDR_SADDR(dst0)->sa_len) { - ipseclog((LOG_DEBUG, - "key_parse: address struct size mismatched.\n")); - PFKEY_STAT_INCREMENT(pfkeystat.out_invaddr); - error = EINVAL; - goto senderror; + if (src0 == NULL) { + src0 = mh.ext[SADB_X_EXT_ADDR_RANGE_SRC_START]; } - - switch (PFKEY_ADDR_SADDR(src0)->sa_family) { - case AF_INET: - if (PFKEY_ADDR_SADDR(src0)->sa_len != - sizeof(struct sockaddr_in)) { - PFKEY_STAT_INCREMENT(pfkeystat.out_invaddr); - error = EINVAL; - goto senderror; - } - break; - case AF_INET6: - if (PFKEY_ADDR_SADDR(src0)->sa_len != - sizeof(struct sockaddr_in6)) { - PFKEY_STAT_INCREMENT(pfkeystat.out_invaddr); - error = EINVAL; - goto senderror; - } - break; - default: - ipseclog((LOG_DEBUG, - "key_parse: unsupported address family.\n")); - PFKEY_STAT_INCREMENT(pfkeystat.out_invaddr); - error = EAFNOSUPPORT; + } + if (mh.ext[SADB_X_EXT_ADDR_RANGE_DST_START] != NULL && + mh.ext[SADB_X_EXT_ADDR_RANGE_DST_END] != NULL) { + error = key_validate_address_pair((struct sadb_address *)(mh.ext[SADB_X_EXT_ADDR_RANGE_DST_START]), + (struct sadb_address *)(mh.ext[SADB_X_EXT_ADDR_RANGE_DST_END])); + if (error != 0) { goto senderror; } - switch (PFKEY_ADDR_SADDR(src0)->sa_family) { - case AF_INET: - plen = sizeof(struct in_addr) << 3; - break; - case AF_INET6: - plen = sizeof(struct in6_addr) << 3; - break; - default: - plen = 0; /*fool gcc*/ - break; + if (dst0 == NULL) { + dst0 = mh.ext[SADB_X_EXT_ADDR_RANGE_DST_START]; } - - /* check max prefix length */ - if (src0->sadb_address_prefixlen > plen || - dst0->sadb_address_prefixlen > plen) { - ipseclog((LOG_DEBUG, - "key_parse: illegal prefixlen.\n")); - PFKEY_STAT_INCREMENT(pfkeystat.out_invaddr); - error = EINVAL; + } + if (src0 != NULL && dst0 != NULL) { + error = key_validate_address_pair((struct sadb_address *)(src0), + (struct sadb_address *)(dst0)); + if (error != 0) { goto senderror; } - - /* - * prefixlen == 0 is valid because there can be a case when - * all addresses are matched. - */ } - if (msg->sadb_msg_type >= sizeof(key_typesw)/sizeof(key_typesw[0]) || + if (msg->sadb_msg_type >= sizeof(key_typesw) / sizeof(key_typesw[0]) || key_typesw[msg->sadb_msg_type] == NULL) { PFKEY_STAT_INCREMENT(pfkeystat.out_invmsgtype); error = EINVAL; goto senderror; } - return (*key_typesw[msg->sadb_msg_type])(so, m, &mh); + error = (*key_typesw[msg->sadb_msg_type])(so, m, &mh); + + return error; senderror: + if (keyAligned) { + bzero_keys(&mh); + } else { + bzero_mbuf(m); + } msg->sadb_msg_errno = error; return key_sendup_mbuf(so, m, target); } @@ -8534,10 +10095,11 @@ key_senderror( { struct sadb_msg *msg; - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); - - if (m->m_len < sizeof(struct sadb_msg)) + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); + + if (m->m_len < sizeof(struct sadb_msg)) { panic("invalid mbuf passed to key_senderror"); + } msg = mtod(m, struct sadb_msg *); msg->sadb_msg_errno = code; @@ -8561,19 +10123,21 @@ key_align( int toff; /* sanity check */ - if (m == NULL || mhp == NULL) + if (m == NULL || mhp == NULL) { panic("key_align: NULL pointer is passed.\n"); - if (m->m_len < sizeof(struct sadb_msg)) + } + if (m->m_len < sizeof(struct sadb_msg)) { panic("invalid mbuf passed to key_align"); + } /* initialize */ bzero(mhp, sizeof(*mhp)); mhp->msg = mtod(m, struct sadb_msg *); - mhp->ext[0] = (struct sadb_ext *)mhp->msg; /*XXX backward compat */ + 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 = 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) { @@ -8604,6 +10168,14 @@ key_align( case SADB_X_EXT_SA2: case SADB_EXT_SESSION_ID: case SADB_EXT_SASTAT: + case SADB_X_EXT_IPSECIF: + case SADB_X_EXT_ADDR_RANGE_SRC_START: + case SADB_X_EXT_ADDR_RANGE_SRC_END: + case SADB_X_EXT_ADDR_RANGE_DST_START: + case SADB_X_EXT_ADDR_RANGE_DST_END: + case SADB_EXT_MIGRATE_ADDRESS_SRC: + case SADB_EXT_MIGRATE_ADDRESS_DST: + case SADB_X_EXT_MIGRATE_IPSECIF: /* duplicate check */ /* * XXX Are there duplication payloads of either @@ -8613,6 +10185,7 @@ key_align( ipseclog((LOG_DEBUG, "key_align: duplicate ext_type %u " "is passed.\n", ext->sadb_ext_type)); + bzero_mbuf(m); m_freem(m); PFKEY_STAT_INCREMENT(pfkeystat.out_dupext); return EINVAL; @@ -8622,6 +10195,7 @@ key_align( ipseclog((LOG_DEBUG, "key_align: invalid ext_type %u is passed.\n", ext->sadb_ext_type)); + bzero_mbuf(m); m_freem(m); PFKEY_STAT_INCREMENT(pfkeystat.out_invexttype); return EINVAL; @@ -8630,6 +10204,7 @@ key_align( extlen = PFKEY_UNUNIT64(ext->sadb_ext_len); if (key_validate_ext(ext, extlen)) { + bzero_mbuf(m); m_freem(m); PFKEY_STAT_INCREMENT(pfkeystat.out_invlen); return EINVAL; @@ -8648,6 +10223,7 @@ key_align( } if (off != end) { + bzero_mbuf(m); m_freem(m); PFKEY_STAT_INCREMENT(pfkeystat.out_invlen); return EINVAL; @@ -8663,26 +10239,36 @@ key_validate_ext( { struct sockaddr *sa; enum { NONE, ADDR } checktype = NONE; - int baselen; + int baselen = 0; const int sal = offsetof(struct sockaddr, sa_len) + sizeof(sa->sa_len); - if (len != PFKEY_UNUNIT64(ext->sadb_ext_len)) + if (len != PFKEY_UNUNIT64(ext->sadb_ext_len)) { return EINVAL; + } /* if it does not match minimum/maximum length, bail */ if (ext->sadb_ext_type >= sizeof(minsize) / sizeof(minsize[0]) || - ext->sadb_ext_type >= sizeof(maxsize) / sizeof(maxsize[0])) + ext->sadb_ext_type >= sizeof(maxsize) / sizeof(maxsize[0])) { return EINVAL; - if (!minsize[ext->sadb_ext_type] || len < minsize[ext->sadb_ext_type]) + } + if (!minsize[ext->sadb_ext_type] || len < minsize[ext->sadb_ext_type]) { return EINVAL; - if (maxsize[ext->sadb_ext_type] && len > maxsize[ext->sadb_ext_type]) + } + if (maxsize[ext->sadb_ext_type] && len > maxsize[ext->sadb_ext_type]) { return EINVAL; + } /* more checks based on sadb_ext_type XXX need more */ switch (ext->sadb_ext_type) { case SADB_EXT_ADDRESS_SRC: case SADB_EXT_ADDRESS_DST: case SADB_EXT_ADDRESS_PROXY: + case SADB_X_EXT_ADDR_RANGE_SRC_START: + case SADB_X_EXT_ADDR_RANGE_SRC_END: + case SADB_X_EXT_ADDR_RANGE_DST_START: + case SADB_X_EXT_ADDR_RANGE_DST_END: + case SADB_EXT_MIGRATE_ADDRESS_SRC: + case SADB_EXT_MIGRATE_ADDRESS_DST: baselen = PFKEY_ALIGN8(sizeof(struct sadb_address)); checktype = ADDR; break; @@ -8692,8 +10278,9 @@ key_validate_ext( sadb_ident_type == SADB_X_IDENTTYPE_ADDR) { baselen = PFKEY_ALIGN8(sizeof(struct sadb_ident)); checktype = ADDR; - } else + } else { checktype = NONE; + } break; default: checktype = NONE; @@ -8704,22 +10291,27 @@ key_validate_ext( case NONE: break; case ADDR: - sa = (struct sockaddr *)((caddr_t)(uintptr_t)ext + baselen); - - if (len < baselen + sal) + sa = (struct sockaddr *)((caddr_t)(uintptr_t)ext + baselen); + + if (len < baselen + sal) { return EINVAL; - if (baselen + PFKEY_ALIGN8(sa->sa_len) != len) + } + if (baselen + PFKEY_ALIGN8(sa->sa_len) != len) { return EINVAL; + } break; } - return 0; -} + /* check key bits length */ + if (ext->sadb_ext_type == SADB_EXT_KEY_AUTH || + ext->sadb_ext_type == SADB_EXT_KEY_ENCRYPT) { + struct sadb_key *key = (struct sadb_key *)(uintptr_t)ext; + if (len < (sizeof(struct sadb_key) + _KEYLEN(key))) { + return EINVAL; + } + } -void -key_domain_init(void) -{ - return; + return 0; } /* @@ -8737,10 +10329,10 @@ key_checktunnelsanity( __unused caddr_t src, __unused caddr_t dst) { - /* sanity check */ - if (sav->sah == NULL) + if (sav->sah == NULL) { panic("sav->sah == NULL at key_checktunnelsanity"); + } /* XXX: check inner IP header */ @@ -8753,14 +10345,15 @@ key_sa_recordxfer( struct secasvar *sav, struct mbuf *m) { - - - if (!sav) + if (!sav) { panic("key_sa_recordxfer called with sav == NULL"); - if (!m) + } + if (!m) { panic("key_sa_recordxfer called with m == NULL"); - if (!sav->lft_c) + } + if (!sav->lft_c) { return; + } lck_mtx_lock(sadb_mutex); /* @@ -8789,14 +10382,14 @@ key_sa_recordxfer( * <--------------> HARD * <-----> SOFT */ - { - struct timeval tv; - microtime(&tv); - sav->lft_c->sadb_lifetime_usetime = tv.tv_sec; - /* XXX check for expires? */ - } + { + struct timeval tv; + microtime(&tv); + sav->lft_c->sadb_lifetime_usetime = tv.tv_sec; + /* XXX check for expires? */ + } lck_mtx_unlock(sadb_mutex); - + return; } @@ -8807,14 +10400,13 @@ key_sa_routechange( { struct secashead *sah; struct route *ro; - + lck_mtx_lock(sadb_mutex); LIST_FOREACH(sah, &sahtree, chain) { - ro = &sah->sa_route; + ro = (struct route *)&sah->sa_route; if (ro->ro_rt && dst->sa_len == ro->ro_dst.sa_len - && bcmp(dst, &ro->ro_dst, dst->sa_len) == 0) { - rtfree(ro->ro_rt); - ro->ro_rt = (struct rtentry *)NULL; + && bcmp(dst, &ro->ro_dst, dst->sa_len) == 0) { + ROUTE_RELEASE(ro); } } lck_mtx_unlock(sadb_mutex); @@ -8827,21 +10419,22 @@ key_sa_chgstate( struct secasvar *sav, u_int8_t state) { - - if (sav == NULL) + if (sav == NULL) { panic("key_sa_chgstate called with sav == NULL"); + } - if (sav->state == state) + if (sav->state == state) { return; + } + + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_OWNED); - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED); - - if (__LIST_CHAINED(sav)) + if (__LIST_CHAINED(sav)) { LIST_REMOVE(sav, chain); + } sav->state = state; LIST_INSERT_HEAD(&sav->sah->savtree[state], sav, chain); - } void @@ -8849,8 +10442,9 @@ key_sa_stir_iv( struct secasvar *sav) { lck_mtx_lock(sadb_mutex); - if (!sav->iv) + if (!sav->iv) { panic("key_sa_stir_iv called with sav == NULL"); + } key_randomfill(sav->iv, sav->ivlen); lck_mtx_unlock(sadb_mutex); } @@ -8866,8 +10460,9 @@ key_alloc_mbuf( len = l; while (len > 0) { MGET(n, M_DONTWAIT, MT_DATA); - if (n && len > MLEN) + if (n && len > MLEN) { MCLGET(n, M_DONTWAIT); + } if (!n) { m_freem(m); return NULL; @@ -8885,71 +10480,72 @@ key_alloc_mbuf( len -= n->m_len; - if (m) + if (m) { m_cat(m, n); - else + } else { m = n; + } } return m; } static struct mbuf * -key_setdumpsastats (u_int32_t dir, - struct sastat *stats, - u_int32_t max_stats, - u_int64_t session_ids[], - u_int32_t seq, - u_int32_t pid) +key_setdumpsastats(u_int32_t dir, + struct sastat *stats, + u_int32_t max_stats, + u_int64_t session_ids[], + u_int32_t seq, + u_int32_t pid) { - struct mbuf *result = NULL, *m = NULL; + struct mbuf *result = NULL, *m = NULL; - m = key_setsadbmsg(SADB_GETSASTAT, 0, 0, seq, pid, 0); - if (!m) { - goto fail; + m = key_setsadbmsg(SADB_GETSASTAT, 0, 0, seq, pid, 0); + if (!m) { + goto fail; } - result = m; + result = m; m = key_setsadbsession_id(session_ids); if (!m) { - goto fail; + goto fail; } - m_cat(result, m); + m_cat(result, m); m = key_setsadbsastat(dir, - stats, - max_stats); + stats, + max_stats); if (!m) { - goto fail; + goto fail; } - m_cat(result, m); + m_cat(result, m); - if ((result->m_flags & M_PKTHDR) == 0) { + if ((result->m_flags & M_PKTHDR) == 0) { goto fail; - } + } - if (result->m_len < sizeof(struct sadb_msg)) { - result = m_pullup(result, sizeof(struct sadb_msg)); + if (result->m_len < sizeof(struct sadb_msg)) { + result = m_pullup(result, sizeof(struct sadb_msg)); if (result == NULL) { goto fail; } - } + } - result->m_pkthdr.len = 0; - for (m = result; m; m = m->m_next) { - result->m_pkthdr.len += m->m_len; + result->m_pkthdr.len = 0; + for (m = result; m; m = m->m_next) { + result->m_pkthdr.len += m->m_len; } - mtod(result, struct sadb_msg *)->sadb_msg_len = - PFKEY_UNIT64(result->m_pkthdr.len); + mtod(result, struct sadb_msg *)->sadb_msg_len = + PFKEY_UNIT64(result->m_pkthdr.len); - return result; + return result; - fail: +fail: if (result) { - m_freem(result); + m_freem(result); } - return NULL; + return NULL; } /* @@ -8958,11 +10554,11 @@ key_setdumpsastats (u_int32_t dir, * * m will always be freed. */ - + static int -key_getsastat (struct socket *so, - struct mbuf *m, - const struct sadb_msghdr *mhp) +key_getsastat(struct socket *so, + struct mbuf *m, + const struct sadb_msghdr *mhp) { struct sadb_session_id *session_id; u_int32_t bufsize, arg_count, res_count; @@ -8972,31 +10568,32 @@ key_getsastat (struct socket *so, int error = 0; /* sanity check */ - if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) - panic("%s: NULL pointer is passed.\n", __FUNCTION__); + if (so == NULL || m == NULL || mhp == NULL || mhp->msg == NULL) { + panic("%s: NULL pointer is passed.\n", __FUNCTION__); + } - if (mhp->ext[SADB_EXT_SESSION_ID] == NULL) { - printf("%s: invalid message is passed. missing session-id.\n", __FUNCTION__); + if (mhp->ext[SADB_EXT_SESSION_ID] == NULL) { + printf("%s: invalid message is passed. missing session-id.\n", __FUNCTION__); return key_senderror(so, m, EINVAL); - } + } if (mhp->extlen[SADB_EXT_SESSION_ID] < sizeof(struct sadb_session_id)) { - printf("%s: invalid message is passed. short session-id.\n", __FUNCTION__); + printf("%s: invalid message is passed. short session-id.\n", __FUNCTION__); return key_senderror(so, m, EINVAL); - } + } if (mhp->ext[SADB_EXT_SASTAT] == NULL) { - printf("%s: invalid message is passed. missing stat args.\n", __FUNCTION__); + printf("%s: invalid message is passed. missing stat args.\n", __FUNCTION__); return key_senderror(so, m, EINVAL); - } - if (mhp->extlen[SADB_EXT_SASTAT] < sizeof(*sa_stats_arg)) { - printf("%s: invalid message is passed. short stat args.\n", __FUNCTION__); + } + if (mhp->extlen[SADB_EXT_SASTAT] < sizeof(*sa_stats_arg)) { + printf("%s: invalid message is passed. short stat args.\n", __FUNCTION__); return key_senderror(so, m, EINVAL); - } + } - lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); // exit early if there are no active SAs if (ipsec_sav_count <= 0) { - printf("%s: No active SAs.\n", __FUNCTION__); + printf("%s: No active SAs.\n", __FUNCTION__); error = ENOENT; goto end; } @@ -9004,33 +10601,34 @@ key_getsastat (struct socket *so, KMALLOC_WAIT(sa_stats_sav, __typeof__(sa_stats_sav), bufsize); if (sa_stats_sav == NULL) { - printf("%s: No more memory.\n", __FUNCTION__); + printf("%s: No more memory.\n", __FUNCTION__); error = ENOMEM; goto end; } bzero(sa_stats_sav, bufsize); - sa_stats_arg = (__typeof__(sa_stats_arg)) - (void *)mhp->ext[SADB_EXT_SASTAT]; + sa_stats_arg = (__typeof__(sa_stats_arg)) + (void *)mhp->ext[SADB_EXT_SASTAT]; arg_count = sa_stats_arg->sadb_sastat_list_len; // exit early if there are no requested SAs if (arg_count == 0) { - printf("%s: No SAs requested.\n", __FUNCTION__); + printf("%s: No SAs requested.\n", __FUNCTION__); error = ENOENT; goto end; } res_count = 0; if (key_getsastatbyspi((struct sastat *)(sa_stats_arg + 1), - arg_count, - sa_stats_sav, - &res_count)) { - printf("%s: Error finding SAs.\n", __FUNCTION__); + arg_count, + sa_stats_sav, + bufsize, + &res_count)) { + printf("%s: Error finding SAs.\n", __FUNCTION__); error = ENOENT; goto end; } if (!res_count) { - printf("%s: No SAs found.\n", __FUNCTION__); + printf("%s: No SAs found.\n", __FUNCTION__); error = ENOENT; goto end; } @@ -9040,33 +10638,34 @@ key_getsastat (struct socket *so, /* send this to the userland. */ n = key_setdumpsastats(sa_stats_arg->sadb_sastat_dir, - sa_stats_sav, - res_count, - session_id->sadb_session_id_v, - mhp->msg->sadb_msg_seq, - mhp->msg->sadb_msg_pid); - if (!n) { - printf("%s: No bufs to dump stats.\n", __FUNCTION__); + sa_stats_sav, + res_count, + session_id->sadb_session_id_v, + mhp->msg->sadb_msg_seq, + mhp->msg->sadb_msg_pid); + if (!n) { + printf("%s: No bufs to dump stats.\n", __FUNCTION__); error = ENOBUFS; goto end; } - key_sendup_mbuf(so, n, KEY_SENDUP_ALL); + key_sendup_mbuf(so, n, KEY_SENDUP_ALL); end: if (sa_stats_sav) { KFREE(sa_stats_sav); } - if (error) + if (error) { return key_senderror(so, m, error); + } m_freem(m); return 0; } static void -key_update_natt_keepalive_timestamp (struct secasvar *sav_sent, - struct secasvar *sav_update) +key_update_natt_keepalive_timestamp(struct secasvar *sav_sent, + struct secasvar *sav_update) { struct secasindex saidx_swap_sent_addr; @@ -9090,3 +10689,199 @@ key_update_natt_keepalive_timestamp (struct secasvar *sav_sent, sav_update->natt_last_activity = natt_now; } } + +static int +key_send_delsp(struct secpolicy *sp) +{ + struct mbuf *result = NULL, *m; + + if (sp == NULL) { + goto fail; + } + + /* set msg header */ + m = key_setsadbmsg(SADB_X_SPDDELETE, 0, 0, 0, 0, 0); + if (!m) { + goto fail; + } + result = m; + + /* set sadb_address(es) for source */ + if (sp->spidx.src_range.start.ss_len > 0) { + m = key_setsadbaddr(SADB_X_EXT_ADDR_RANGE_SRC_START, + (struct sockaddr *)&sp->spidx.src_range.start, sp->spidx.prefs, + sp->spidx.ul_proto); + if (!m) { + goto fail; + } + m_cat(result, m); + + m = key_setsadbaddr(SADB_X_EXT_ADDR_RANGE_SRC_END, + (struct sockaddr *)&sp->spidx.src_range.end, sp->spidx.prefs, + sp->spidx.ul_proto); + if (!m) { + goto fail; + } + m_cat(result, m); + } else { + m = key_setsadbaddr(SADB_EXT_ADDRESS_SRC, + (struct sockaddr *)&sp->spidx.src, sp->spidx.prefs, + sp->spidx.ul_proto); + if (!m) { + goto fail; + } + m_cat(result, m); + } + + /* set sadb_address(es) for destination */ + if (sp->spidx.dst_range.start.ss_len > 0) { + m = key_setsadbaddr(SADB_X_EXT_ADDR_RANGE_DST_START, + (struct sockaddr *)&sp->spidx.dst_range.start, sp->spidx.prefd, + sp->spidx.ul_proto); + if (!m) { + goto fail; + } + m_cat(result, m); + + m = key_setsadbaddr(SADB_X_EXT_ADDR_RANGE_DST_END, + (struct sockaddr *)&sp->spidx.dst_range.end, sp->spidx.prefd, + sp->spidx.ul_proto); + if (!m) { + goto fail; + } + m_cat(result, m); + } else { + m = key_setsadbaddr(SADB_EXT_ADDRESS_DST, + (struct sockaddr *)&sp->spidx.dst, sp->spidx.prefd, + sp->spidx.ul_proto); + if (!m) { + goto fail; + } + m_cat(result, m); + } + + /* set secpolicy */ + m = key_sp2msg(sp); + if (!m) { + goto fail; + } + m_cat(result, m); + + if ((result->m_flags & M_PKTHDR) == 0) { + goto fail; + } + + if (result->m_len < sizeof(struct sadb_msg)) { + result = m_pullup(result, sizeof(struct sadb_msg)); + if (result == NULL) { + goto fail; + } + } + + result->m_pkthdr.len = 0; + for (m = result; m; m = m->m_next) { + result->m_pkthdr.len += m->m_len; + } + + mtod(result, struct sadb_msg *)->sadb_msg_len = PFKEY_UNIT64(result->m_pkthdr.len); + + return key_sendup_mbuf(NULL, result, KEY_SENDUP_REGISTERED); + +fail: + if (result) { + m_free(result); + } + return -1; +} + +void +key_delsp_for_ipsec_if(ifnet_t ipsec_if) +{ + struct secashead *sah; + struct secasvar *sav, *nextsav; + u_int stateidx; + u_int state; + struct secpolicy *sp, *nextsp; + int dir; + + if (ipsec_if == NULL) { + return; + } + + LCK_MTX_ASSERT(sadb_mutex, LCK_MTX_ASSERT_NOTOWNED); + + lck_mtx_lock(sadb_mutex); + + for (dir = 0; dir < IPSEC_DIR_MAX; dir++) { + for (sp = LIST_FIRST(&sptree[dir]); + sp != NULL; + sp = nextsp) { + nextsp = LIST_NEXT(sp, chain); + + if (sp->ipsec_if == ipsec_if) { + ifnet_release(sp->ipsec_if); + sp->ipsec_if = NULL; + + key_send_delsp(sp); + + sp->state = IPSEC_SPSTATE_DEAD; + key_freesp(sp, KEY_SADB_LOCKED); + } + } + } + + LIST_FOREACH(sah, &sahtree, chain) { + if (sah->ipsec_if == ipsec_if) { + /* This SAH is linked to the IPsec interface. It now needs to close. */ + ifnet_release(sah->ipsec_if); + sah->ipsec_if = NULL; + + for (stateidx = 0; stateidx < _ARRAYLEN(saorder_state_alive); stateidx++) { + state = saorder_state_any[stateidx]; + for (sav = LIST_FIRST(&sah->savtree[state]); sav != NULL; sav = nextsav) { + nextsav = LIST_NEXT(sav, chain); + + key_sa_chgstate(sav, SADB_SASTATE_DEAD); + key_freesav(sav, KEY_SADB_LOCKED); + } + } + + sah->state = SADB_SASTATE_DEAD; + } + } + + lck_mtx_unlock(sadb_mutex); +} + +__private_extern__ u_int32_t +key_fill_offload_frames_for_savs(ifnet_t ifp, + struct ifnet_keepalive_offload_frame *frames_array, + u_int32_t frames_array_count, + size_t frame_data_offset) +{ + struct secashead *sah = NULL; + struct secasvar *sav = NULL; + struct ifnet_keepalive_offload_frame *frame = frames_array; + u_int32_t frame_index = 0; + + if (frame == NULL || frames_array_count == 0) { + return frame_index; + } + + lck_mtx_lock(sadb_mutex); + LIST_FOREACH(sah, &sahtree, chain) { + LIST_FOREACH(sav, &sah->savtree[SADB_SASTATE_MATURE], chain) { + if (ipsec_fill_offload_frame(ifp, sav, frame, frame_data_offset)) { + frame_index++; + if (frame_index >= frames_array_count) { + lck_mtx_unlock(sadb_mutex); + return frame_index; + } + frame = &(frames_array[frame_index]); + } + } + } + lck_mtx_unlock(sadb_mutex); + + return frame_index; +}