Commit:     8109616e2ef978d142ea45850efd4f102b9bdce4
Parent:     8b819412481494fb6861c08d360b75fabcbbfbbf
Author:     Gerrit Renker <[EMAIL PROTECTED]>
AuthorDate: Thu Dec 13 12:31:26 2007 -0200
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 14:57:50 2008 -0800

    [DCCP]: Add (missing) option parsing to request_sock processing
    This adds option-parsing code to processing of Acks in the listening state
    on request_socks on the server, serving two purposes
     (i)  resolves a FIXME (removed);
     (ii) paves the way for feature-negotiation during connection-setup.
    There is an intended subtlety here with regard to dccp_check_req:
     Parsing options happens only after testing whether the received packet is
     a retransmitted Request.  Otherwise, if the Request contained (a possibly
     large number of) feature-negotiation options, recomputing state would have 
     happen each time a retransmitted Request arrives, which opens the door to 
     easy DoS attack.  Since in a genuine retransmission the options should not 
     different from the original, reusing the already computed state seems 
     The other point is - if there are timestamp options on the Request, they 
     not be answered; which means that in the presence of retransmission (likely
     due to loss and/or other problems), the use of Request/Response RTT 
     is suspended, so that startup problems here do not propagate.
    Signed-off-by: Gerrit Renker <[EMAIL PROTECTED]>
    Signed-off-by: Ian McDonald <[EMAIL PROTECTED]>
    Signed-off-by: Arnaldo Carvalho de Melo <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
 net/dccp/minisocks.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c
index 831b76e..b1d5da6 100644
--- a/net/dccp/minisocks.c
+++ b/net/dccp/minisocks.c
@@ -200,10 +200,10 @@ struct sock *dccp_check_req(struct sock *sk, struct 
sk_buff *skb,
                            struct request_sock **prev)
        struct sock *child = NULL;
+       struct dccp_request_sock *dreq = dccp_rsk(req);
        /* Check for retransmitted REQUEST */
        if (dccp_hdr(skb)->dccph_type == DCCP_PKT_REQUEST) {
-               struct dccp_request_sock *dreq = dccp_rsk(req);
                if (after48(DCCP_SKB_CB(skb)->dccpd_seq, dreq->dreq_isr)) {
                        dccp_pr_debug("Retransmitted REQUEST\n");
@@ -227,22 +227,22 @@ struct sock *dccp_check_req(struct sock *sk, struct 
sk_buff *skb,
                goto drop;
        /* Invalid ACK */
-       if (DCCP_SKB_CB(skb)->dccpd_ack_seq != dccp_rsk(req)->dreq_iss) {
+       if (DCCP_SKB_CB(skb)->dccpd_ack_seq != dreq->dreq_iss) {
                dccp_pr_debug("Invalid ACK number: ack_seq=%llu, "
                              (unsigned long long)
-                             (unsigned long long)
-                             dccp_rsk(req)->dreq_iss);
+                             (unsigned long long) dreq->dreq_iss);
                goto drop;
+       if (dccp_parse_options(sk, dreq, skb))
+                goto drop;
        child = inet_csk(sk)->icsk_af_ops->syn_recv_sock(sk, skb, req, NULL);
        if (child == NULL)
                goto listen_overflow;
-       /* FIXME: deal with options */
        inet_csk_reqsk_queue_unlink(sk, req, prev);
        inet_csk_reqsk_queue_removed(sk, req);
        inet_csk_reqsk_queue_add(sk, req, child);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to