Browse Source

sctp: consider idata chunks when setting SCTP_MAXSEG

When setting SCTP_MAXSEG sock option, it should consider which kind of
data chunk is being used if the asoc is already available, so that the
limit better reflect reality.

Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Marcelo Ricardo Leitner 7 years ago
parent
commit
439ef0309c
1 changed files with 6 additions and 3 deletions
  1. 6 3
      net/sctp/socket.c

+ 6 - 3
net/sctp/socket.c

@@ -3233,18 +3233,21 @@ static int sctp_setsockopt_maxseg(struct sock *sk, char __user *optval, unsigned
 		return -EINVAL;
 		return -EINVAL;
 	}
 	}
 
 
+	asoc = sctp_id2assoc(sk, params.assoc_id);
+
 	if (val) {
 	if (val) {
 		int min_len, max_len;
 		int min_len, max_len;
+		__u16 datasize = asoc ? sctp_datachk_len(&asoc->stream) :
+				 sizeof(struct sctp_data_chunk);
 
 
 		min_len = sctp_mtu_payload(sp, SCTP_DEFAULT_MINSEGMENT,
 		min_len = sctp_mtu_payload(sp, SCTP_DEFAULT_MINSEGMENT,
-					   sizeof(struct sctp_data_chunk));
-		max_len = SCTP_MAX_CHUNK_LEN - sizeof(struct sctp_data_chunk);
+					   datasize);
+		max_len = SCTP_MAX_CHUNK_LEN - datasize;
 
 
 		if (val < min_len || val > max_len)
 		if (val < min_len || val > max_len)
 			return -EINVAL;
 			return -EINVAL;
 	}
 	}
 
 
-	asoc = sctp_id2assoc(sk, params.assoc_id);
 	if (asoc) {
 	if (asoc) {
 		if (val == 0) {
 		if (val == 0) {
 			val = asoc->pathmtu - af->net_header_len;
 			val = asoc->pathmtu - af->net_header_len;