From 69ebca1e35a39d75032f3d8092da563f60673110 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Tue, 11 Oct 2011 12:24:41 -0700 Subject: [PATCH] dpif-linux: Avoid unaligned accesses to vport stats sent by the datapath. Reported-by: Jesse Gross --- lib/dpif-linux.h | 6 +++++- lib/netdev-vport.c | 33 ++++++++++++++++++++------------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/lib/dpif-linux.h b/lib/dpif-linux.h index c72ea88f..a9f8bfea 100644 --- a/lib/dpif-linux.h +++ b/lib/dpif-linux.h @@ -32,7 +32,11 @@ struct dpif_linux_vport { uint32_t port_no; /* UINT32_MAX if unknown. */ enum ovs_vport_type type; - /* Attributes. */ + /* Attributes. + * + * The 'stats' member points to 64-bit data that might only be aligned on + * 32-bit boundaries, so use get_unaligned_u64() to access its values. + */ const char *name; /* OVS_VPORT_ATTR_NAME. */ const uint32_t *upcall_pid; /* OVS_VPORT_ATTR_UPCALL_PID. */ const struct ovs_vport_stats *stats; /* OVS_VPORT_ATTR_STATS. */ diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c index 06ec8fbe..70cdf290 100644 --- a/lib/netdev-vport.c +++ b/lib/netdev-vport.c @@ -44,6 +44,7 @@ #include "route-table.h" #include "shash.h" #include "socket-util.h" +#include "unaligned.h" #include "vlog.h" VLOG_DEFINE_THIS_MODULE(netdev_vport); @@ -361,22 +362,21 @@ netdev_vport_get_etheraddr(const struct netdev *netdev, return error; } -#define COPY_OVS_STATS \ - dst->rx_packets = src->rx_packets; \ - dst->tx_packets = src->tx_packets; \ - dst->rx_bytes = src->rx_bytes; \ - dst->tx_bytes = src->tx_bytes; \ - dst->rx_errors = src->rx_errors; \ - dst->tx_errors = src->tx_errors; \ - dst->rx_dropped = src->rx_dropped; \ - dst->tx_dropped = src->tx_dropped; - -/* Copies 'src' into 'dst', performing format conversion in the process. */ +/* Copies 'src' into 'dst', performing format conversion in the process. + * + * 'src' is allowed to be misaligned. */ static void netdev_stats_from_ovs_vport_stats(struct netdev_stats *dst, const struct ovs_vport_stats *src) { - COPY_OVS_STATS + dst->rx_packets = get_unaligned_u64(&src->rx_packets); + dst->tx_packets = get_unaligned_u64(&src->tx_packets); + dst->rx_bytes = get_unaligned_u64(&src->rx_bytes); + dst->tx_bytes = get_unaligned_u64(&src->tx_bytes); + dst->rx_errors = get_unaligned_u64(&src->rx_errors); + dst->tx_errors = get_unaligned_u64(&src->tx_errors); + dst->rx_dropped = get_unaligned_u64(&src->rx_dropped); + dst->tx_dropped = get_unaligned_u64(&src->tx_dropped); dst->multicast = 0; dst->collisions = 0; dst->rx_length_errors = 0; @@ -397,7 +397,14 @@ static void netdev_stats_to_ovs_vport_stats(struct ovs_vport_stats *dst, const struct netdev_stats *src) { - COPY_OVS_STATS + dst->rx_packets = src->rx_packets; + dst->tx_packets = src->tx_packets; + dst->rx_bytes = src->rx_bytes; + dst->tx_bytes = src->tx_bytes; + dst->rx_errors = src->rx_errors; + dst->tx_errors = src->tx_errors; + dst->rx_dropped = src->rx_dropped; + dst->tx_dropped = src->tx_dropped; } int -- 2.30.2