diff options
| author | pfg <pfg@FreeBSD.org> | 2016-04-19 23:48:27 +0000 |
|---|---|---|
| committer | pfg <pfg@FreeBSD.org> | 2016-04-19 23:48:27 +0000 |
| commit | a7d40a88c91d105dcfe2f235bc84a522bfea3de2 (patch) | |
| tree | de102c840aded1a3b5511745802f9d6ef74aeb6f /sys/netipsec/key.c | |
| parent | 99e9a53c8161ee4ae550ad18b73edd303a3724f4 (diff) | |
| download | FreeBSD-src-a7d40a88c91d105dcfe2f235bc84a522bfea3de2.zip FreeBSD-src-a7d40a88c91d105dcfe2f235bc84a522bfea3de2.tar.gz | |
kernel: use our nitems() macro when it is available through param.h.
No functional change, only trivial cases are done in this sweep,
Discussed in: freebsd-current
Diffstat (limited to 'sys/netipsec/key.c')
| -rw-r--r-- | sys/netipsec/key.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c index 7070c1d..4e8c633 100644 --- a/sys/netipsec/key.c +++ b/sys/netipsec/key.c @@ -3365,7 +3365,7 @@ key_setdumpsa(struct secasvar *sav, u_int8_t type, u_int8_t satype, goto fail; result = m; - for (i = sizeof(dumporder)/sizeof(dumporder[0]) - 1; i >= 0; i--) { + for (i = nitems(dumporder) - 1; i >= 0; i--) { m = NULL; switch (dumporder[i]) { case SADB_EXT_SA: @@ -7410,7 +7410,7 @@ key_parse(struct mbuf *m, struct socket *so) */ } - if (msg->sadb_msg_type >= sizeof(key_typesw)/sizeof(key_typesw[0]) || + if (msg->sadb_msg_type >= nitems(key_typesw) || key_typesw[msg->sadb_msg_type] == NULL) { PFKEYSTAT_INC(out_invmsgtype); error = EINVAL; @@ -7562,8 +7562,8 @@ key_validate_ext(const struct sadb_ext *ext, int 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])) + if (ext->sadb_ext_type >= nitems(minsize) || + ext->sadb_ext_type >= nitems(maxsize)) return EINVAL; if (!minsize[ext->sadb_ext_type] || len < minsize[ext->sadb_ext_type]) return EINVAL; |
