]> err.no Git - linux-2.6/commitdiff
dccp: Bug in initial acknowledgment number assignment
authorGerrit Renker <gerrit@erg.abdn.ac.uk>
Wed, 11 Jun 2008 10:19:10 +0000 (11:19 +0100)
committerGerrit Renker <gerrit@erg.abdn.ac.uk>
Wed, 11 Jun 2008 10:19:10 +0000 (11:19 +0100)
Step 8.5 in RFC 4340 says for the newly cloned socket

           Initialize S.GAR := S.ISS,

but what in fact the code (minisocks.c) does is

           Initialize S.GAR := S.ISR,

which is wrong (typo?) -- fixed by the patch.

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
net/dccp/minisocks.c

index 33ad48321b08e0dda2e14dba752c0e27f4bf9111..66dca5bba858612e747a399d9bcea41bb03dc0f6 100644 (file)
@@ -165,12 +165,12 @@ out_free:
                /* See dccp_v4_conn_request */
                newdmsk->dccpms_sequence_window = req->rcv_wnd;
 
-               newdp->dccps_gar = newdp->dccps_isr = dreq->dreq_isr;
-               dccp_update_gsr(newsk, dreq->dreq_isr);
-
-               newdp->dccps_iss = dreq->dreq_iss;
+               newdp->dccps_gar = newdp->dccps_iss = dreq->dreq_iss;
                dccp_update_gss(newsk, dreq->dreq_iss);
 
+               newdp->dccps_isr = dreq->dreq_isr;
+               dccp_update_gsr(newsk, dreq->dreq_isr);
+
                /*
                 * SWL and AWL are initially adjusted so that they are not less than
                 * the initial Sequence Numbers received and sent, respectively: