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

[Ben Hutchings]

Author: benh
Date: Sat May 23 15:42:36 2015
New Revision: 22679

Log:
cdc_ncm: Fix tx_bytes statistics (regression in 3.16.7-ckt11)

Added:
   dists/jessie/linux/debian/patches/bugfix/all/cdc_ncm-fix-tx_bytes-statistics.patch
Modified:
   dists/jessie/linux/debian/changelog
   dists/jessie/linux/debian/patches/series

Modified: dists/jessie/linux/debian/changelog
==============================================================================
--- dists/jessie/linux/debian/changelog	Sat May 23 15:04:11 2015	(r22678)
+++ dists/jessie/linux/debian/changelog	Sat May 23 15:42:36 2015	(r22679)
@@ -171,6 +171,7 @@
     - Add support for ACPI identification to xhci-platform
   * md/raid0: fix restore to sector variable in raid0_make_request
     (regression in 3.16.7-ckt11)
+  * cdc_ncm: Fix tx_bytes statistics (regression in 3.16.7-ckt11)
 
   [ Ian Campbell ]
   * [armhf] Enable support for Freescale SNVS RTC. (Closes: #782364)

Added: dists/jessie/linux/debian/patches/bugfix/all/cdc_ncm-fix-tx_bytes-statistics.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/jessie/linux/debian/patches/bugfix/all/cdc_ncm-fix-tx_bytes-statistics.patch	Sat May 23 15:42:36 2015	(r22679)
@@ -0,0 +1,37 @@
+From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bjorn at mork.no>
+Date: Fri, 22 May 2015 13:15:22 +0200
+Subject: cdc_ncm: Fix tx_bytes statistics
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Origin: https://git.kernel.org/linus/44f6731d8b68fa02f5ed65eaceac41f8c3c9279e
+
+The tx_curr_frame_payload field is u32. When we try to calculate a
+small negative delta based on it, we end up with a positive integer
+close to 2^32 instead.  So the tx_bytes pointer increases by about
+2^32 for every transmitted frame.
+
+Fix by calculating the delta as a signed long.
+
+Cc: Ben Hutchings <ben.hutchings at codethink.co.uk>
+Reported-by: Florian Bruhin <me at the-compiler.org>
+Fixes: 7a1e890e2168 ("usbnet: Fix tx_bytes statistic running backward in cdc_ncm")
+Signed-off-by: Bjørn Mork <bjorn at mork.no>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/usb/cdc_ncm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
+index c3e4da9..8067b8f 100644
+--- a/drivers/net/usb/cdc_ncm.c
++++ b/drivers/net/usb/cdc_ncm.c
+@@ -1182,7 +1182,7 @@ cdc_ncm_fill_tx_frame(struct usbnet *dev, struct sk_buff *skb, __le32 sign)
+ 	 * payload data instead.
+ 	 */
+ 	usbnet_set_skb_tx_stats(skb_out, n,
+-				ctx->tx_curr_frame_payload - skb_out->len);
++				(long)ctx->tx_curr_frame_payload - skb_out->len);
+ 
+ 	return skb_out;
+ 

Modified: dists/jessie/linux/debian/patches/series
==============================================================================
--- dists/jessie/linux/debian/patches/series	Sat May 23 15:04:11 2015	(r22678)
+++ dists/jessie/linux/debian/patches/series	Sat May 23 15:42:36 2015	(r22679)
@@ -219,6 +219,7 @@
 bugfix/all/libata-blacklist-queued-trim-on-samsung-ssd-850-pro.patch
 bugfix/all/config-enable-need_dma_map_state-by-default-when-swi.patch
 bugfix/all/md-raid0-fix-restore-to-sector-variable-in-raid0_make_request.patch
+bugfix/all/cdc_ncm-fix-tx_bytes-statistics.patch
 
 # memfd_create() & kdbus backport
 features/all/kdbus/mm-allow-drivers-to-prevent-new-writable-mappings.patch