summaryrefslogtreecommitdiffstats
path: root/net/sctp
diff options
context:
space:
mode:
authorMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>2018-04-26 16:59:02 -0300
committerDavid S. Miller <davem@davemloft.net>2018-04-27 14:35:24 -0400
commit38687b56c51b535024d46d6b5375163a6a40a196 (patch)
tree56ef91a153676cf598653f135975fabb58694018 /net/sctp
parent439ef0309cf4b743d76edc2abeca72b27ee1d996 (diff)
downloadlinux-stable-38687b56c51b535024d46d6b5375163a6a40a196.tar.gz
linux-stable-38687b56c51b535024d46d6b5375163a6a40a196.tar.bz2
linux-stable-38687b56c51b535024d46d6b5375163a6a40a196.zip
sctp: allow unsetting sockopt MAXSEG
RFC 6458 Section 8.1.16 says that setting MAXSEG as 0 means that the user is not limiting it, and not that it should set to the *current* maximum, as we are doing. This patch thus allow setting it as 0, effectively removing the user limit. Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp')
-rw-r--r--net/sctp/socket.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 2d35c8ea2470..1b4593b842b0 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -3211,7 +3211,6 @@ static int sctp_setsockopt_mappedv4(struct sock *sk, char __user *optval, unsign
static int sctp_setsockopt_maxseg(struct sock *sk, char __user *optval, unsigned int optlen)
{
struct sctp_sock *sp = sctp_sk(sk);
- struct sctp_af *af = sp->pf->af;
struct sctp_assoc_value params;
struct sctp_association *asoc;
int val;
@@ -3249,12 +3248,6 @@ static int sctp_setsockopt_maxseg(struct sock *sk, char __user *optval, unsigned
}
if (asoc) {
- if (val == 0) {
- val = asoc->pathmtu - af->net_header_len;
- val -= af->ip_options_len(sk);
- val -= sizeof(struct sctphdr) +
- sctp_datachk_len(&asoc->stream);
- }
asoc->user_frag = val;
sctp_assoc_update_frag_point(asoc);
} else {