X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetlink.c;h=bbd6b6d4136e2568a8905124cf4a7822a03c18d6;hb=HEAD;hp=50444abd973c9352239ecb98cbacc59fae31ac22;hpb=db5a101931c5393d5f9df600559882418d536878;p=sliver-openvswitch.git diff --git a/lib/netlink.c b/lib/netlink.c index 50444abd9..bbd6b6d41 100644 --- a/lib/netlink.c +++ b/lib/netlink.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. + * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -66,8 +66,8 @@ nl_msg_nlmsgerr(const struct ofpbuf *msg, int *errorp) struct nlmsgerr *err = ofpbuf_at(msg, NLMSG_HDRLEN, sizeof *err); int code = EPROTO; if (!err) { - VLOG_ERR_RL(&rl, "received invalid nlmsgerr (%zd bytes < %zd)", - msg->size, NLMSG_HDRLEN + sizeof *err); + VLOG_ERR_RL(&rl, "received invalid nlmsgerr (%"PRIu32"d bytes < %"PRIuSIZE"d)", + ofpbuf_size(msg), NLMSG_HDRLEN + sizeof *err); } else if (err->error <= 0 && err->error > INT_MIN) { code = -err->error; } @@ -113,7 +113,7 @@ nl_msg_put_nlmsghdr(struct ofpbuf *msg, { struct nlmsghdr *nlmsghdr; - ovs_assert(msg->size == 0); + ovs_assert(ofpbuf_size(msg) == 0); nl_msg_reserve(msg, NLMSG_HDRLEN + expected_payload); nlmsghdr = nl_msg_put_uninit(msg, NLMSG_HDRLEN); @@ -152,7 +152,7 @@ nl_msg_put_genlmsghdr(struct ofpbuf *msg, size_t expected_payload, struct genlmsghdr *genlmsghdr; nl_msg_put_nlmsghdr(msg, GENL_HDRLEN + expected_payload, family, flags); - ovs_assert(msg->size == NLMSG_HDRLEN); + ovs_assert(ofpbuf_size(msg) == NLMSG_HDRLEN); genlmsghdr = nl_msg_put_uninit(msg, GENL_HDRLEN); genlmsghdr->cmd = cmd; genlmsghdr->version = version; @@ -174,7 +174,7 @@ nl_msg_put(struct ofpbuf *msg, const void *data, size_t size) void * nl_msg_put_uninit(struct ofpbuf *msg, size_t size) { - size_t pad = NLMSG_ALIGN(size) - size; + size_t pad = PAD_SIZE(size, NLMSG_ALIGNTO); char *p = ofpbuf_put_uninit(msg, size + pad); if (pad) { memset(p + size, 0, pad); @@ -197,7 +197,7 @@ nl_msg_push(struct ofpbuf *msg, const void *data, size_t size) void * nl_msg_push_uninit(struct ofpbuf *msg, size_t size) { - size_t pad = NLMSG_ALIGN(size) - size; + size_t pad = PAD_SIZE(size, NLMSG_ALIGNTO); char *p = ofpbuf_push_uninit(msg, size + pad); if (pad) { memset(p + size, 0, pad); @@ -220,6 +220,18 @@ nl_msg_put_unspec_uninit(struct ofpbuf *msg, uint16_t type, size_t size) return nla + 1; } +/* Appends a Netlink attribute of the given 'type' and room for 'size' bytes of + * data as its payload, plus Netlink padding if needed, to the tail end of + * 'msg', reallocating and copying its data if necessary. Returns a pointer to + * the first byte of data in the attribute, which is zeroed. */ +void * +nl_msg_put_unspec_zero(struct ofpbuf *msg, uint16_t type, size_t size) +{ + void *data = nl_msg_put_unspec_uninit(msg, type, size); + memset(data, 0, size); + return data; +} + /* Appends a Netlink attribute of the given 'type' and the 'size' bytes of * 'data' as its payload, to the tail end of 'msg', reallocating and copying * its data if necessary. Returns a pointer to the first byte of data in the @@ -322,7 +334,7 @@ nl_msg_push_unspec_uninit(struct ofpbuf *msg, uint16_t type, size_t size) { size_t total_size = NLA_HDRLEN + size; struct nlattr* nla = nl_msg_push_uninit(msg, total_size); - ovs_assert(NLA_ALIGN(total_size) <= UINT16_MAX); + ovs_assert(!nl_attr_oversized(size)); nla->nla_len = total_size; nla->nla_type = type; return nla + 1; @@ -420,7 +432,7 @@ nl_msg_push_string(struct ofpbuf *msg, uint16_t type, const char *value) size_t nl_msg_start_nested(struct ofpbuf *msg, uint16_t type) { - size_t offset = msg->size; + size_t offset = ofpbuf_size(msg); nl_msg_put_unspec(msg, type, NULL, 0); return offset; } @@ -431,7 +443,7 @@ void nl_msg_end_nested(struct ofpbuf *msg, size_t offset) { struct nlattr *attr = ofpbuf_at_assert(msg, offset, sizeof *attr); - attr->nla_len = msg->size - offset; + attr->nla_len = ofpbuf_size(msg) - offset; } /* Appends a nested Netlink attribute of the given 'type', with the 'size' @@ -447,27 +459,37 @@ nl_msg_put_nested(struct ofpbuf *msg, /* If 'buffer' begins with a valid "struct nlmsghdr", pulls the header and its * payload off 'buffer', stores header and payload in 'msg->data' and - * 'msg->size', and returns a pointer to the header. + * 'ofpbuf_size(msg)', and returns a pointer to the header. * * If 'buffer' does not begin with a "struct nlmsghdr" or begins with one that * is invalid, returns NULL without modifying 'buffer'. */ struct nlmsghdr * nl_msg_next(struct ofpbuf *buffer, struct ofpbuf *msg) { - if (buffer->size >= sizeof(struct nlmsghdr)) { + if (ofpbuf_size(buffer) >= sizeof(struct nlmsghdr)) { struct nlmsghdr *nlmsghdr = nl_msg_nlmsghdr(buffer); size_t len = nlmsghdr->nlmsg_len; - if (len >= sizeof *nlmsghdr && len <= buffer->size) { + if (len >= sizeof *nlmsghdr && len <= ofpbuf_size(buffer)) { ofpbuf_use_const(msg, nlmsghdr, len); ofpbuf_pull(buffer, len); return nlmsghdr; } } - msg->data = NULL; - msg->size = 0; + ofpbuf_set_data(msg, NULL); + ofpbuf_set_size(msg, 0); return NULL; } + +/* Returns true if a Netlink attribute with a payload that is 'payload_size' + * bytes long would be oversized, that is, if it's not possible to create an + * nlattr of that size because its size wouldn't fit in the 16-bit nla_len + * field. */ +bool +nl_attr_oversized(size_t payload_size) +{ + return NL_ATTR_SIZE(payload_size) > UINT16_MAX; +} /* Attributes. */ @@ -621,7 +643,7 @@ min_attr_len(enum nl_attr_type type) case NL_A_STRING: return 1; case NL_A_FLAG: return 0; case NL_A_NESTED: return 0; - case N_NL_ATTR_TYPES: default: NOT_REACHED(); + case N_NL_ATTR_TYPES: default: OVS_NOT_REACHED(); } } @@ -639,7 +661,7 @@ max_attr_len(enum nl_attr_type type) case NL_A_STRING: return SIZE_MAX; case NL_A_FLAG: return SIZE_MAX; case NL_A_NESTED: return SIZE_MAX; - case N_NL_ATTR_TYPES: default: NOT_REACHED(); + case N_NL_ATTR_TYPES: default: OVS_NOT_REACHED(); } } @@ -668,8 +690,8 @@ nl_attr_validate(const struct nlattr *nla, const struct nl_policy *policy) /* Verify length. */ len = nl_attr_get_size(nla); if (len < min_len || len > max_len) { - VLOG_DBG_RL(&rl, "attr %"PRIu16" length %zu not in " - "allowed range %zu...%zu", type, len, min_len, max_len); + VLOG_DBG_RL(&rl, "attr %"PRIu16" length %"PRIuSIZE" not in " + "allowed range %"PRIuSIZE"...%"PRIuSIZE, type, len, min_len, max_len); return false; } @@ -706,13 +728,13 @@ nl_policy_parse(const struct ofpbuf *msg, size_t nla_offset, memset(attrs, 0, n_attrs * sizeof *attrs); - if (msg->size < nla_offset) { + if (ofpbuf_size(msg) < nla_offset) { VLOG_DBG_RL(&rl, "missing headers in nl_policy_parse"); return false; } NL_ATTR_FOR_EACH (nla, left, ofpbuf_at(msg, nla_offset, 0), - msg->size - nla_offset) + ofpbuf_size(msg) - nla_offset) { uint16_t type = nl_attr_type(nla); if (type < n_attrs && policy[type].type != NL_A_NO_ATTR) { @@ -734,7 +756,7 @@ nl_policy_parse(const struct ofpbuf *msg, size_t nla_offset, for (i = 0; i < n_attrs; i++) { const struct nl_policy *e = &policy[i]; if (!e->optional && e->type != NL_A_NO_ATTR && !attrs[i]) { - VLOG_DBG_RL(&rl, "required attr %zu missing", i); + VLOG_DBG_RL(&rl, "required attr %"PRIuSIZE" missing", i); return false; } } @@ -776,7 +798,7 @@ nl_attr_find__(const struct nlattr *attrs, size_t size, uint16_t type) const struct nlattr * nl_attr_find(const struct ofpbuf *buf, size_t hdr_len, uint16_t type) { - return nl_attr_find__(ofpbuf_at(buf, hdr_len, 0), buf->size - hdr_len, + return nl_attr_find__(ofpbuf_at(buf, hdr_len, 0), ofpbuf_size(buf) - hdr_len, type); }