[kernel] r16347 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Fri Sep 24 04:28:51 2010
New Revision: 16347

Log:
sctp: Do not reset the packet during sctp_packet_config()

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/sctp-Do-not-reset-the-packet-during-sctp_packet_config.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/24

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Thu Sep 23 19:58:22 2010	(r16346)
+++ dists/sid/linux-2.6/debian/changelog	Fri Sep 24 04:28:51 2010	(r16347)
@@ -11,6 +11,7 @@
   * [x86] Revert "i915: Blacklist i830, i845, i855 for KMS". The current X
     driver (xserver-xorg-video-intel version 2.12.0+shadow-1) should work
     properly with KMS on these chips. (Closes: #596453)
+  * sctp: Do not reset the packet during sctp_packet_config()
 
   [ Martin Michlmayr ]
   * ARM: update mach types.

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/sctp-Do-not-reset-the-packet-during-sctp_packet_config.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/sctp-Do-not-reset-the-packet-during-sctp_packet_config.patch	Fri Sep 24 04:28:51 2010	(r16347)
@@ -0,0 +1,34 @@
+From: Vlad Yasevich <vladislav.yasevich at hp.com>
+Date: Wed, 15 Sep 2010 10:00:26 -0400
+Subject: [PATCH] sctp: Do not reset the packet during sctp_packet_config().
+
+commit 4bdab43323b459900578b200a4b8cf9713ac8fab upstream.
+
+sctp_packet_config() is called when getting the packet ready
+for appending of chunks.  The function should not touch the
+current state, since it's possible to ping-pong between two
+transports when sending, and that can result packet corruption
+followed by skb overlfow crash.
+
+Reported-by: Thomas Dreibholz <dreibh at iem.uni-due.de>
+Signed-off-by: Vlad Yasevich <vladislav.yasevich at hp.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ net/sctp/output.c |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/net/sctp/output.c b/net/sctp/output.c
+index a646681..bcc4590 100644
+--- a/net/sctp/output.c
++++ b/net/sctp/output.c
+@@ -92,7 +92,6 @@ struct sctp_packet *sctp_packet_config(struct sctp_packet *packet,
+ 	SCTP_DEBUG_PRINTK("%s: packet:%p vtag:0x%x\n", __func__,
+ 			  packet, vtag);
+ 
+-	sctp_packet_reset(packet);
+ 	packet->vtag = vtag;
+ 
+ 	if (ecn_capable && sctp_packet_empty(packet)) {
+-- 
+1.7.1
+

Modified: dists/sid/linux-2.6/debian/patches/series/24
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/24	Thu Sep 23 19:58:22 2010	(r16346)
+++ dists/sid/linux-2.6/debian/patches/series/24	Fri Sep 24 04:28:51 2010	(r16347)
@@ -35,3 +35,4 @@
 + debian/revert-sched-Pre-compute-cpumask_weight-sched_domain.patch
 + debian/sched-Avoid-ABI-change-due-to-sched_class-changes.patch
 - debian/i915-Blacklist-i830-i845-i855-for-KMS.patch
++ bugfix/all/sctp-Do-not-reset-the-packet-during-sctp_packet_config.patch