From 15c5268fa8f4a114ed52da1193901ed26eca8699 Mon Sep 17 00:00:00 2001 From: Gerrit Renker Date: Wed, 21 Nov 2007 10:13:53 -0200 Subject: [PATCH] --- yaml --- r: 78188 b: refs/heads/master c: c86ab2b6a5deec2223a606b90c001bedda9d950b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/dccp/options.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index a71046262496..2ac449541c27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d57b43bf810cd66ccf252c04ba65c3e8e56cbb1 +refs/heads/master: c86ab2b6a5deec2223a606b90c001bedda9d950b diff --git a/trunk/net/dccp/options.c b/trunk/net/dccp/options.c index d286cffe2c49..523250b45ea5 100644 --- a/trunk/net/dccp/options.c +++ b/trunk/net/dccp/options.c @@ -136,7 +136,7 @@ int dccp_parse_options(struct sock *sk, struct sk_buff *skb) break; case DCCPO_ACK_VECTOR_0: case DCCPO_ACK_VECTOR_1: - if (pkt_type == DCCP_PKT_DATA) + if (dccp_packet_without_ack(skb)) /* RFC 4340, 11.4 */ break; if (dccp_msk(sk)->dccpms_send_ack_vector && @@ -194,18 +194,17 @@ int dccp_parse_options(struct sock *sk, struct sk_buff *skb) opt_recv->dccpor_elapsed_time = elapsed_time; break; case DCCPO_ELAPSED_TIME: - if (len != 2 && len != 4) - goto out_invalid_option; - - if (pkt_type == DCCP_PKT_DATA) - continue; + if (dccp_packet_without_ack(skb)) /* RFC 4340, 13.2 */ + break; if (len == 2) { __be16 opt_val2 = get_unaligned((__be16 *)value); elapsed_time = ntohs(opt_val2); - } else { + } else if (len == 4) { opt_val = get_unaligned((__be32 *)value); elapsed_time = ntohl(opt_val); + } else { + goto out_invalid_option; } if (elapsed_time > opt_recv->dccpor_elapsed_time)