netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Lee A. Roberts" <lee.roberts@hp.com>
To: netdev@vger.kernel.org
Cc: linux-sctp@vger.kernel.org, lee.roberts@hp.com
Subject: [PATCH v3 2/4] sctp: fix association hangs due to reneging packets below the cumulative TSN ACK point
Date: Thu, 28 Feb 2013 07:37:28 -0700	[thread overview]
Message-ID: <1362062250-26749-3-git-send-email-lee.roberts@hp.com> (raw)
In-Reply-To: <1361991273-30578-1-git-send-email-lee.roberts@hp.com>

From: "Lee A. Roberts" <lee.roberts@hp.com>

In sctp_ulpq_renege_list(), do not renege packets below the
cumulative TSN ACK point.

Signed-off-by: Lee A. Roberts <lee.roberts@hp.com>
---
 net/sctp/ulpqueue.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/net/sctp/ulpqueue.c b/net/sctp/ulpqueue.c
index ada1746..63afddc 100644
--- a/net/sctp/ulpqueue.c
+++ b/net/sctp/ulpqueue.c
@@ -969,11 +969,16 @@ static __u16 sctp_ulpq_renege_list(struct sctp_ulpq *ulpq,
 
 	tsnmap = &ulpq->asoc->peer.tsn_map;
 
-	while ((skb = __skb_dequeue_tail(list)) != NULL) {
-		freed += skb_headlen(skb);
+	while ((skb = skb_peek_tail(list)) != NULL) {
 		event = sctp_skb2event(skb);
 		tsn = event->tsn;
 
+		/* Don't renege below the Cumulative TSN ACK Point. */
+		if (TSN_lte(tsn, sctp_tsnmap_get_ctsn(tsnmap)))
+			break;
+
+		__skb_unlink(skb, list);
+		freed += skb_headlen(skb);
 		sctp_ulpevent_free(event);
 		sctp_tsnmap_renege(tsnmap, tsn);
 		if (freed >= needed)
-- 
1.7.9.5

  parent reply	other threads:[~2013-02-28 14:36 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-26 14:36 [PATCH 0/4] sctp: fix association hangs due to reassembly/ordering logic Lee A. Roberts
2013-02-26 14:36 ` [PATCH 1/4] sctp: fix association hangs due to off-by-one errors in sctp_tsnmap_grow() Lee A. Roberts
2013-02-27 13:52   ` Vlad Yasevich
2013-02-26 14:36 ` [PATCH 2/4] sctp: fix association hangs due to reneging packets below the cumulative TSN ACK point Lee A. Roberts
2013-02-27 13:52   ` Vlad Yasevich
2013-02-26 14:36 ` [PATCH 3/4] sctp: fix association hangs due to errors when reneging events from the ordering queue Lee A. Roberts
2013-02-27 13:53   ` Vlad Yasevich
2013-02-26 14:36 ` [PATCH 4/4] sctp: fix association hangs due to partial delivery errors Lee A. Roberts
2013-02-27  2:34   ` Vlad Yasevich
2013-02-27  4:38     ` Roberts, Lee A.
2013-02-27 13:51       ` Vlad Yasevich
2013-02-27 13:53   ` Vlad Yasevich
2013-02-26 22:37 ` [PATCH 0/4] sctp: fix association hangs due to reassembly/ordering logic David Miller
2013-02-27 12:35   ` Neil Horman
2013-02-27 16:41   ` Sridhar Samudrala
2013-02-27 17:15     ` Neil Horman
2013-02-27 18:09 ` David Miller
2013-02-27 18:55   ` Roberts, Lee A.
2013-02-27 19:09     ` David Miller
2013-02-27 18:54 ` [PATCH v2 " Lee A. Roberts
2013-02-27 19:36   ` Daniel Borkmann
2013-02-27 19:43     ` David Miller
2013-02-27 20:13   ` Vlad Yasevich
2013-02-27 20:24     ` David Miller
2013-02-27 20:49       ` Vlad Yasevich
2013-02-27 20:26     ` Roberts, Lee A.
2013-02-28 14:37   ` [PATCH v3 " Lee A. Roberts
2013-02-28 15:07     ` Vlad Yasevich
2013-02-28 20:36     ` David Miller
2013-02-28 14:37   ` [PATCH v3 1/4] sctp: fix association hangs due to off-by-one errors in sctp_tsnmap_grow() Lee A. Roberts
2013-02-28 14:37   ` Lee A. Roberts [this message]
2013-02-28 14:37   ` [PATCH v3 3/4] sctp: fix association hangs due to errors when reneging events from the ordering queue Lee A. Roberts
2013-02-28 14:37   ` [PATCH v3 4/4] sctp: fix association hangs due to partial delivery errors Lee A. Roberts
2013-02-27 18:54 ` [PATCH v2 1/4] sctp: fix association hangs due to off-by-one errors in sctp_tsnmap_grow() Lee A. Roberts
2013-02-28 14:31   ` Neil Horman
2013-02-27 18:54 ` [PATCH v2 2/4] sctp: fix association hangs due to reneging packets below the cumulative TSN ACK point Lee A. Roberts
2013-02-28 14:33   ` Neil Horman
2013-02-27 18:54 ` [PATCH v2 3/4] sctp: fix association hangs due to errors when reneging events from the ordering queue Lee A. Roberts
2013-02-28 14:34   ` Neil Horman
2013-02-27 18:54 ` [PATCH v2 4/4] sctp: fix association hangs due to partial delivery errors Lee A. Roberts
2013-02-28 14:34   ` Neil Horman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1362062250-26749-3-git-send-email-lee.roberts@hp.com \
    --to=lee.roberts@hp.com \
    --cc=linux-sctp@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).