aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>2016-01-22 15:29:49 -0500
committerDavid S. Miller <davem@davemloft.net>2016-01-25 01:43:21 -0500
commit27f7ed2b11d42ab6d796e96533c2076ec220affc (patch)
treefb1232a621d48ec214484cad838278e679f0ea88 /net
parentfacc432faa59414bd7c60c307ff1645154a66c98 (diff)
sctp: allow setting SCTP_SACK_IMMEDIATELY by the application
This patch extends commit b93d6471748d ("sctp: implement the sender side for SACK-IMMEDIATELY extension") as it didn't white list SCTP_SACK_IMMEDIATELY on sctp_msghdr_parse(), causing it to be understood as an invalid flag and returning -EINVAL to the application. Note that the actual handling of the flag is already there in sctp_datamsg_from_user(). https://tools.ietf.org/html/rfc7053#section-7 Fixes: b93d6471748d ("sctp: implement the sender side for SACK-IMMEDIATELY extension") Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> Acked-by: Vlad Yasevich <vyasevich@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/sctp/socket.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 9bb80ec4c08f..5ca2ebfe0be8 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -6636,6 +6636,7 @@ static int sctp_msghdr_parse(const struct msghdr *msg, sctp_cmsgs_t *cmsgs)
6636 6636
6637 if (cmsgs->srinfo->sinfo_flags & 6637 if (cmsgs->srinfo->sinfo_flags &
6638 ~(SCTP_UNORDERED | SCTP_ADDR_OVER | 6638 ~(SCTP_UNORDERED | SCTP_ADDR_OVER |
6639 SCTP_SACK_IMMEDIATELY |
6639 SCTP_ABORT | SCTP_EOF)) 6640 SCTP_ABORT | SCTP_EOF))
6640 return -EINVAL; 6641 return -EINVAL;
6641 break; 6642 break;
@@ -6659,6 +6660,7 @@ static int sctp_msghdr_parse(const struct msghdr *msg, sctp_cmsgs_t *cmsgs)
6659 6660
6660 if (cmsgs->sinfo->snd_flags & 6661 if (cmsgs->sinfo->snd_flags &
6661 ~(SCTP_UNORDERED | SCTP_ADDR_OVER | 6662 ~(SCTP_UNORDERED | SCTP_ADDR_OVER |
6663 SCTP_SACK_IMMEDIATELY |
6662 SCTP_ABORT | SCTP_EOF)) 6664 SCTP_ABORT | SCTP_EOF))
6663 return -EINVAL; 6665 return -EINVAL;
6664 break; 6666 break;