]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
sctp: allow setting SCTP_SACK_IMMEDIATELY by the application
authorMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Fri, 22 Jan 2016 20:29:49 +0000 (18:29 -0200)
committerJiri Slaby <jslaby@suse.cz>
Wed, 2 Mar 2016 15:29:05 +0000 (16:29 +0100)
[ 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 <marcelo.leitner@gmail.com>
Acked-by: Vlad Yasevich <vyasevich@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
net/sctp/socket.c

index 9c47fbc5de0cbb6f8dbbb330579930c7f83decab..92de688a966fe6577dbd85a79d486043d25b8fbc 100644 (file)
@@ -6420,6 +6420,7 @@ static int sctp_msghdr_parse(const struct msghdr *msg, sctp_cmsgs_t *cmsgs)
                        /* Minimally, validate the sinfo_flags. */
                        if (cmsgs->info->sinfo_flags &
                            ~(SCTP_UNORDERED | SCTP_ADDR_OVER |
+                             SCTP_SACK_IMMEDIATELY |
                              SCTP_ABORT | SCTP_EOF))
                                return -EINVAL;
                        break;