]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
sctp: process duplicated strreset asoc request correctly
authorXin Long <lucien.xin@gmail.com>
Sat, 15 Apr 2017 14:00:29 +0000 (22:00 +0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 18 Apr 2017 17:39:50 +0000 (13:39 -0400)
This patch is to fix the replay attack issue for strreset asoc requests.

When a duplicated strreset asoc request is received, reply it with bad
seqno if it's seqno < asoc->strreset_inseq - 2, and reply it with the
result saved in asoc if it's seqno >= asoc->strreset_inseq - 2.

But note that if the result saved in asoc is performed, the sender's next
tsn and receiver's next tsn for the response chunk should be set. It's
safe to get them from asoc. Because if it's changed, which means the peer
has received the response already, the new response with wrong tsn won't
be accepted by peer.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sctp/stream.c

index c91d97e5d590e1d9ef3eab22a84a877c9561500d..dda53a2939866d5bb7e3233a1ba0a90160ecf488 100644 (file)
@@ -529,12 +529,21 @@ struct sctp_chunk *sctp_process_strreset_tsnreq(
        __u16 i;
 
        request_seq = ntohl(tsnreq->request_seq);
-       if (request_seq > asoc->strreset_inseq) {
+       if (TSN_lt(asoc->strreset_inseq, request_seq) ||
+           TSN_lt(request_seq, asoc->strreset_inseq - 2)) {
                result = SCTP_STRRESET_ERR_BAD_SEQNO;
-               goto out;
-       } else if (request_seq == asoc->strreset_inseq) {
-               asoc->strreset_inseq++;
+               goto err;
+       } else if (TSN_lt(request_seq, asoc->strreset_inseq)) {
+               i = asoc->strreset_inseq - request_seq - 1;
+               result = asoc->strreset_result[i];
+               if (result == SCTP_STRRESET_PERFORMED) {
+                       next_tsn = asoc->next_tsn;
+                       init_tsn =
+                               sctp_tsnmap_get_ctsn(&asoc->peer.tsn_map) + 1;
+               }
+               goto err;
        }
+       asoc->strreset_inseq++;
 
        if (!(asoc->strreset_enable & SCTP_ENABLE_RESET_ASSOC_REQ))
                goto out;
@@ -591,6 +600,8 @@ struct sctp_chunk *sctp_process_strreset_tsnreq(
                                                    next_tsn, GFP_ATOMIC);
 
 out:
+       sctp_update_strreset_result(asoc, result);
+err:
        return sctp_make_strreset_tsnresp(asoc, result, request_seq,
                                          next_tsn, init_tsn);
 }