net: fix unaligned access in IFLA_STATS64

Tony Luck observes that the original IFLA_STATS64 submission causes
unaligned accesses. This is because nla_data() returns a pointer to a
memory region that is only aligned to 32 bits. Do some memcpying to
workaround this.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index ffc6cf3495acd6f2e4d75a03e13169ed1215452a..ed0766f0181ac1473c4c5e3845016a3496b92326 100644 (file)
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -602,36 +602,38 @@ static void copy_rtnl_link_stats(struct rtnl_link_stats *a,
        a->tx_compressed = b->tx_compressed;
 }
 
-static void copy_rtnl_link_stats64(struct rtnl_link_stats64 *a,
-                                  const struct net_device_stats *b)
+static void copy_rtnl_link_stats64(void *v, const struct net_device_stats *b)
 {
-       a->rx_packets = b->rx_packets;
-       a->tx_packets = b->tx_packets;
-       a->rx_bytes = b->rx_bytes;
-       a->tx_bytes = b->tx_bytes;
-       a->rx_errors = b->rx_errors;
-       a->tx_errors = b->tx_errors;
-       a->rx_dropped = b->rx_dropped;
-       a->tx_dropped = b->tx_dropped;
-
-       a->multicast = b->multicast;
-       a->collisions = b->collisions;
-
-       a->rx_length_errors = b->rx_length_errors;
-       a->rx_over_errors = b->rx_over_errors;
-       a->rx_crc_errors = b->rx_crc_errors;
-       a->rx_frame_errors = b->rx_frame_errors;
-       a->rx_fifo_errors = b->rx_fifo_errors;
-       a->rx_missed_errors = b->rx_missed_errors;
-
-       a->tx_aborted_errors = b->tx_aborted_errors;
-       a->tx_carrier_errors = b->tx_carrier_errors;
-       a->tx_fifo_errors = b->tx_fifo_errors;
-       a->tx_heartbeat_errors = b->tx_heartbeat_errors;
-       a->tx_window_errors = b->tx_window_errors;
-
-       a->rx_compressed = b->rx_compressed;
-       a->tx_compressed = b->tx_compressed;
+       struct rtnl_link_stats64 a;
+
+       a.rx_packets = b->rx_packets;
+       a.tx_packets = b->tx_packets;
+       a.rx_bytes = b->rx_bytes;
+       a.tx_bytes = b->tx_bytes;
+       a.rx_errors = b->rx_errors;
+       a.tx_errors = b->tx_errors;
+       a.rx_dropped = b->rx_dropped;
+       a.tx_dropped = b->tx_dropped;
+
+       a.multicast = b->multicast;
+       a.collisions = b->collisions;
+
+       a.rx_length_errors = b->rx_length_errors;
+       a.rx_over_errors = b->rx_over_errors;
+       a.rx_crc_errors = b->rx_crc_errors;
+       a.rx_frame_errors = b->rx_frame_errors;
+       a.rx_fifo_errors = b->rx_fifo_errors;
+       a.rx_missed_errors = b->rx_missed_errors;
+
+       a.tx_aborted_errors = b->tx_aborted_errors;
+       a.tx_carrier_errors = b->tx_carrier_errors;
+       a.tx_fifo_errors = b->tx_fifo_errors;
+       a.tx_heartbeat_errors = b->tx_heartbeat_errors;
+       a.tx_window_errors = b->tx_window_errors;
+
+       a.rx_compressed = b->rx_compressed;
+       a.tx_compressed = b->tx_compressed;
+       memcpy(v, &a, sizeof(a));
 }
 
 static inline int rtnl_vfinfo_size(const struct net_device *dev)
@@ -734,8 +736,6 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
                        sizeof(struct rtnl_link_stats64));
        if (attr == NULL)
                goto nla_put_failure;
-
-       stats = dev_get_stats(dev);
        copy_rtnl_link_stats64(nla_data(attr), stats);
 
        if (dev->netdev_ops->ndo_get_vf_config && dev->dev.parent) {