[kernel] r22817 - in dists/jessie-security/linux/debian: . patches patches/bugfix/all

[Ian James Campbell]

Author: ijc
Date: Wed Jul  8 20:53:50 2015
New Revision: 22817

Log:
[xen] xen-netback: return correct ethtool stats (Closes: #786936)

Added:
   dists/jessie-security/linux/debian/patches/bugfix/all/xen-netback-return-correct-ethtool-stats.patch
Modified:
   dists/jessie-security/linux/debian/changelog
   dists/jessie-security/linux/debian/patches/series

Modified: dists/jessie-security/linux/debian/changelog
==============================================================================
--- dists/jessie-security/linux/debian/changelog	Wed Jul  8 02:16:21 2015	(r22816)
+++ dists/jessie-security/linux/debian/changelog	Wed Jul  8 20:53:50 2015	(r22817)
@@ -5,6 +5,9 @@
     (CVE-2015-4167)
   * udp: fix behavior of wrong checksums (CVE-2015-5364, CVE-2015-5366)
 
+  [ Ian Campbell ]
+  * [xen] xen-netback: return correct ethtool stats (Closes: #786936)
+
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 14 Jun 2015 22:49:47 +0100
 
 linux (3.16.7-ckt11-1) jessie; urgency=medium

Added: dists/jessie-security/linux/debian/patches/bugfix/all/xen-netback-return-correct-ethtool-stats.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/jessie-security/linux/debian/patches/bugfix/all/xen-netback-return-correct-ethtool-stats.patch	Wed Jul  8 20:53:50 2015	(r22817)
@@ -0,0 +1,35 @@
+From d63951d7442982ef81df585a9c08c2b5fd49f898 Mon Sep 17 00:00:00 2001
+From: David Vrabel <david.vrabel at citrix.com>
+Date: Wed, 4 Mar 2015 11:14:46 +0000
+Subject: [PATCH] xen-netback: return correct ethtool stats
+Origin: http://git.kernel.org/linus/d63951d7442982ef81df585a9c08c2b5fd49f898
+
+Use correct pointer arithmetic to get the pointer to each stat.
+
+Signed-off-by: David Vrabel <david.vrabel at citrix.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/xen-netback/interface.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
+index f38227a..3aa8648 100644
+--- a/drivers/net/xen-netback/interface.c
++++ b/drivers/net/xen-netback/interface.c
+@@ -340,12 +340,11 @@ static void xenvif_get_ethtool_stats(struct net_device *dev,
+ 	unsigned int num_queues = vif->num_queues;
+ 	int i;
+ 	unsigned int queue_index;
+-	struct xenvif_stats *vif_stats;
+ 
+ 	for (i = 0; i < ARRAY_SIZE(xenvif_stats); i++) {
+ 		unsigned long accum = 0;
+ 		for (queue_index = 0; queue_index < num_queues; ++queue_index) {
+-			vif_stats = &vif->queues[queue_index].stats;
++			void *vif_stats = &vif->queues[queue_index].stats;
+ 			accum += *(unsigned long *)(vif_stats + xenvif_stats[i].offset);
+ 		}
+ 		data[i] = accum;
+-- 
+2.1.4
+

Modified: dists/jessie-security/linux/debian/patches/series
==============================================================================
--- dists/jessie-security/linux/debian/patches/series	Wed Jul  8 02:16:21 2015	(r22816)
+++ dists/jessie-security/linux/debian/patches/series	Wed Jul  8 20:53:50 2015	(r22817)
@@ -221,6 +221,7 @@
 bugfix/all/cdc_ncm-fix-tx_bytes-statistics.patch
 bugfix/all/udf-remove-repeated-loads-blocksize.patch
 bugfix/all/udf-check-length-of-extended-attributes-and-allocati.patch
+bugfix/all/xen-netback-return-correct-ethtool-stats.patch
 
 # memfd_create() & kdbus backport
 features/all/kdbus/mm-allow-drivers-to-prevent-new-writable-mappings.patch