From: Marcelo Ricardo Leitner Date: Fri, 22 Jan 2016 20:29:49 +0000 (-0200) Subject: sctp: allow setting SCTP_SACK_IMMEDIATELY by the application X-Git-Tag: v4.1.12-92~150^2~185 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=29adc97a03d89457698a828bb0ed4244027d0c07;p=users%2Fjedix%2Flinux-maple.git sctp: allow setting SCTP_SACK_IMMEDIATELY by the application Orabug: 23330933 [ Upstream commit 27f7ed2b11d42ab6d796e96533c2076ec220affc ] 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 Acked-by: Vlad Yasevich Signed-off-by: David S. Miller Signed-off-by: Sasha Levin (cherry picked from commit 6e13e7b0183e0b9945ff350bd5fad573c2ece83c) Signed-off-by: Dan Duval --- diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 83e5f00ca2322..d73385df0e6df 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -6653,6 +6653,7 @@ static int sctp_msghdr_parse(const struct msghdr *msg, sctp_cmsgs_t *cmsgs) if (cmsgs->srinfo->sinfo_flags & ~(SCTP_UNORDERED | SCTP_ADDR_OVER | + SCTP_SACK_IMMEDIATELY | SCTP_ABORT | SCTP_EOF)) return -EINVAL; break; @@ -6676,6 +6677,7 @@ static int sctp_msghdr_parse(const struct msghdr *msg, sctp_cmsgs_t *cmsgs) if (cmsgs->sinfo->snd_flags & ~(SCTP_UNORDERED | SCTP_ADDR_OVER | + SCTP_SACK_IMMEDIATELY | SCTP_ABORT | SCTP_EOF)) return -EINVAL; break;