From 2c57c90f27d42569a85e1fe0c06d60f1b5b5e977 Mon Sep 17 00:00:00 2001 From: Vlad Yasevich Date: Sat, 17 Jun 2006 22:54:51 -0700 Subject: [PATCH] --- yaml --- r: 27589 b: refs/heads/master c: 402d68c43326d2f0e7e2e9a9013cd4c098d9b87c h: refs/heads/master i: 27587: 3557321214384962ecc78f40d6c8734872ace4ca v: v3 --- [refs] | 2 +- trunk/net/sctp/socket.c | 26 +++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b9eca9a01195..f952a7ea23dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c7ce1ae21223fe1f905feba272bc14b87994a57d +refs/heads/master: 402d68c43326d2f0e7e2e9a9013cd4c098d9b87c diff --git a/trunk/net/sctp/socket.c b/trunk/net/sctp/socket.c index 174d4d35e951..b41dcbb89685 100644 --- a/trunk/net/sctp/socket.c +++ b/trunk/net/sctp/socket.c @@ -2530,8 +2530,32 @@ static int sctp_setsockopt_associnfo(struct sock *sk, char __user *optval, int o /* 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;