mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-30 22:05:19 +00:00
Code Issues Releases Wiki Activity

netlink: Introduce helpers for 128-bit integer attributes.

Browse Source 
Use the helpers in appropriate places.  In most cases, this fixes a
misaligned reference, since ovs_be128 and ovs_u128 require 8-byte alignment
but Netlink only guarantees 4-byte.

Found by GCC -fsanitize=undefined.

Reported-by: Lance Richardson <lrichard@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Lance Richardson <lrichard@redhat.com>
This commit is contained in:
Ben Pfaff
2017-06-14 09:07:45 -07:00
parent 62a78fe5d9
commit ab79d262e1
4 changed files with 77 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/dpif-netlink.c
View File

@@ -2924,8 +2924,7 @@ dpif_netlink_flow_from_ofpbuf(struct dpif_netlink_flow *flow,
.optional = true },
[OVS_FLOW_ATTR_TCP_FLAGS] = { .type = NL_A_U8, .optional = true },
[OVS_FLOW_ATTR_USED] = { .type = NL_A_U64, .optional = true },
[OVS_FLOW_ATTR_UFID] = { .type = NL_A_UNSPEC, .optional = true,
.min_len = sizeof(ovs_u128) },
[OVS_FLOW_ATTR_UFID] = { .type = NL_A_U128, .optional = true },
/* The kernel never uses OVS_FLOW_ATTR_CLEAR. */
/* The kernel never uses OVS_FLOW_ATTR_PROBE. */
/* The kernel never uses OVS_FLOW_ATTR_UFID_FLAGS. */
@@ -2957,11 +2956,7 @@ dpif_netlink_flow_from_ofpbuf(struct dpif_netlink_flow *flow,
}
if (a[OVS_FLOW_ATTR_UFID]) {
const ovs_u128 *ufid;
ufid = nl_attr_get_unspec(a[OVS_FLOW_ATTR_UFID],
nl_attr_get_size(a[OVS_FLOW_ATTR_UFID]));
flow->ufid = *ufid;
flow->ufid = nl_attr_get_u128(a[OVS_FLOW_ATTR_UFID]);
flow->ufid_present = true;
}
if (a[OVS_FLOW_ATTR_MASK]) {
@@ -3032,8 +3027,7 @@ dpif_netlink_flow_to_ofpbuf(const struct dpif_netlink_flow *flow,
ovs_header->dp_ifindex = flow->dp_ifindex;
if (flow->ufid_present) {
nl_msg_put_unspec(buf, OVS_FLOW_ATTR_UFID, &flow->ufid,
sizeof flow->ufid);
nl_msg_put_u128(buf, OVS_FLOW_ATTR_UFID, flow->ufid);
}
if (flow->ufid_terse) {
nl_msg_put_u32(buf, OVS_FLOW_ATTR_UFID_FLAGS,