From: Chris Wright <chrisw@sous-sol.org>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: Justin Forbes <jmforbes@linuxtx.org>,
Zwane Mwaikambo <zwane@arm.linux.org.uk>,
"Theodore Ts'o" <tytso@mit.edu>,
Randy Dunlap <rdunlap@xenotime.net>,
Dave Jones <davej@redhat.com>,
Chuck Wolber <chuckw@quantumlinux.com>,
Chris Wedgwood <reviews@ml.cw.f00f.org>,
torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk,
David Miller <davem@davemloft.net>,
Vlad Yasevich <vladislav.yasevich@hp.com>,
Sridhar Samudrala <sri@us.ibm.com>
Subject: [PATCH 05/25] SCTP: Limit association max_retrans setting in setsockopt.
Date: Tue, 27 Jun 2006 00:00:05 -0700 [thread overview]
Message-ID: <20060627201011.007417000@sous-sol.org> (raw)
In-Reply-To: 20060627200745.771284000@sous-sol.org
[-- Attachment #1: sctp-limit-association-max_retrans-setting-in-setsockopt.patch --]
[-- Type: text/plain, Size: 1958 bytes --]
-stable review patch. If anyone has any objections, please let us know.
------------------
From: Vlad Yasevich <vladislav.yasevich@hp.com>
When using ASSOCINFO socket option, we need to limit the number of
maximum association retransmissions to be no greater than the sum
of all the path retransmissions. This is specified in Section 7.1.2
of the SCTP socket API draft.
However, we only do this if the association has multiple paths. If
there is only one path, the protocol stack will use the
assoc_max_retrans setting when trying to retransmit packets.
Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
---
net/sctp/socket.c | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
--- linux-2.6.17.1.orig/net/sctp/socket.c
+++ linux-2.6.17.1/net/sctp/socket.c
@@ -2530,8 +2530,32 @@ static int sctp_setsockopt_associnfo(str
/* Set the values to the specific association */
if (asoc) {
- if (assocparams.sasoc_asocmaxrxt != 0)
+ if (assocparams.sasoc_asocmaxrxt != 0) {
+ __u32 path_sum = 0;
+ int paths = 0;
+ struct list_head *pos;
+ struct sctp_transport *peer_addr;
+
+ list_for_each(pos, &asoc->peer.transport_addr_list) {
+ peer_addr = list_entry(pos,
+ struct sctp_transport,
+ transports);
+ path_sum += peer_addr->pathmaxrxt;
+ paths++;
+ }
+
+ /* Only validate asocmaxrxt if we have more then
+ * one path/transport. We do this because path
+ * retransmissions are only counted when we have more
+ * then one path.
+ */
+ if (paths > 1 &&
+ assocparams.sasoc_asocmaxrxt > path_sum)
+ return -EINVAL;
+
asoc->max_retrans = assocparams.sasoc_asocmaxrxt;
+ }
+
if (assocparams.sasoc_cookie_life != 0) {
asoc->cookie_life.tv_sec =
assocparams.sasoc_cookie_life / 1000;
--
next prev parent reply other threads:[~2006-06-27 20:12 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-27 20:07 [PATCH 00/25] -stable review Chris Wright
2006-06-27 7:00 ` [PATCH 01/25] USB: Whiteheat: fix firmware spurious errors Chris Wright
2006-06-27 7:00 ` [PATCH 02/25] SERIAL: PARPORT_SERIAL should depend on SERIAL_8250_PCI Chris Wright
2006-06-27 7:00 ` [PATCH 03/25] IPV6: Sum real space for RTAs Chris Wright
2006-06-27 7:00 ` [PATCH 04/25] PFKEYV2: Fix inconsistent typing in struct sadb_x_kmprivate Chris Wright
2006-06-27 7:00 ` Chris Wright [this message]
2006-06-27 7:00 ` [PATCH 06/25] SCTP: Reject sctp packets with broadcast addresses Chris Wright
2006-06-27 7:00 ` [PATCH 07/25] SCTP: Reset rtt_in_progress for the chunk when processing its sack Chris Wright
2006-06-27 7:00 ` [PATCH 08/25] SCTP: Send only 1 window update SACK per message Chris Wright
2006-06-27 7:00 ` [PATCH 09/25] SCTP: Fix persistent slowdown in sctp when a gap ack consumes rx buffer Chris Wright
2006-06-27 7:00 ` [PATCH 10/25] ETHTOOL: Fix UFO typo Chris Wright
2006-06-27 7:00 ` [PATCH 11/25] SPARC32: Fix iommu_flush_iotlb end address Chris Wright
2006-06-27 7:00 ` [PATCH 12/25] NTFS: Critical bug fix (affects MIPS and possibly others) Chris Wright
2006-06-27 7:00 ` [PATCH 13/25] x86: compile fix for asm-i386/alternatives.h Chris Wright
2006-06-27 7:00 ` [PATCH 14/25] bcm43xx: init fix for possible Machine Check Chris Wright
2006-06-27 7:00 ` [PATCH 15/25] UML: fix uptime Chris Wright
2006-06-27 7:00 ` [PATCH 16/25] IPV6: Fix source address selection Chris Wright
2006-06-27 7:00 ` [PATCH 17/25] IPV6 ADDRCONF: Fix default source address selection without CONFIG_IPV6_PRIVACY Chris Wright
2006-06-27 7:00 ` [PATCH 18/25] ohci1394: Fix broken suspend/resume in ohci1394 Chris Wright
2006-06-27 22:07 ` Stefan Richter
2006-06-28 16:42 ` [stable] " Chris Wright
2006-06-27 7:00 ` [PATCH 19/25] libata: minor patch for ATA_DFLAG_PIO Chris Wright
2006-06-27 7:00 ` [PATCH 20/25] ide-io: increase timeout value to allow for slave wakeup Chris Wright
2006-06-27 7:00 ` [PATCH 21/25] kbuild: Fix 100% initramfs bloat in 2.6.17 versus 2.6.16 Chris Wright
2006-06-29 21:34 ` [stable] " Chris Wright
2006-06-29 21:43 ` Nix
2006-06-29 21:46 ` Chris Wright
2006-06-27 7:00 ` [PATCH 22/25] Link error when futexes are disabled on 64bit architectures Chris Wright
2006-06-27 7:00 ` [PATCH 23/25] idr: fix race in idr code Chris Wright
2006-06-27 7:00 ` [PATCH 24/25] Input: return correct size when reading modalias attribute Chris Wright
2006-06-27 7:00 ` [PATCH 25/25] generic_file_buffered_write(): deadlock on vectored write Chris Wright
2006-06-29 18:24 ` [stable] " Chris Wright
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=20060627201011.007417000@sous-sol.org \
--to=chrisw@sous-sol.org \
--cc=akpm@osdl.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=chuckw@quantumlinux.com \
--cc=davej@redhat.com \
--cc=davem@davemloft.net \
--cc=jmforbes@linuxtx.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rdunlap@xenotime.net \
--cc=reviews@ml.cw.f00f.org \
--cc=sri@us.ibm.com \
--cc=stable@kernel.org \
--cc=torvalds@osdl.org \
--cc=tytso@mit.edu \
--cc=vladislav.yasevich@hp.com \
--cc=zwane@arm.linux.org.uk \
/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