diff options
| author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2007-09-26 11:32:49 -0300 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 16:52:43 -0700 |
| commit | 9bf55cda9b2487fa7316dad3880acb0031ad3c0f (patch) | |
| tree | ed4e30691351b9d59583f17a6811f14d0fbcb9e1 /net/dccp | |
| parent | a94f0f970549e63e54c80c4509db299c514d8c11 (diff) | |
| download | kernel_samsung_smdk4412-9bf55cda9b2487fa7316dad3880acb0031ad3c0f.zip kernel_samsung_smdk4412-9bf55cda9b2487fa7316dad3880acb0031ad3c0f.tar.gz kernel_samsung_smdk4412-9bf55cda9b2487fa7316dad3880acb0031ad3c0f.tar.bz2 | |
[DCCP]: Sequence number wrap-around when sending reset
This replaces normal addition with mod-48 addition so that sequence number
wraparound is respected.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Diffstat (limited to 'net/dccp')
| -rw-r--r-- | net/dccp/ipv4.c | 2 | ||||
| -rw-r--r-- | net/dccp/ipv6.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index 2c62828..58a79c2 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c @@ -552,7 +552,7 @@ static void dccp_v4_ctl_send_reset(struct sock *sk, struct sk_buff *rxskb) /* See "8.3.1. Abnormal Termination" in RFC 4340 */ if (DCCP_SKB_CB(rxskb)->dccpd_ack_seq != DCCP_PKT_WITHOUT_ACK_SEQ) - dccp_set_seqno(&seqno, DCCP_SKB_CB(rxskb)->dccpd_ack_seq + 1); + seqno = ADD48(DCCP_SKB_CB(rxskb)->dccpd_ack_seq, 1); dccp_hdr_set_seq(dh, seqno); dccp_hdr_set_ack(dccp_hdr_ack_bits(skb), DCCP_SKB_CB(rxskb)->dccpd_seq); diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index b158c66..d954e83 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c @@ -336,7 +336,7 @@ static void dccp_v6_ctl_send_reset(struct sock *sk, struct sk_buff *rxskb) /* See "8.3.1. Abnormal Termination" in RFC 4340 */ if (DCCP_SKB_CB(rxskb)->dccpd_ack_seq != DCCP_PKT_WITHOUT_ACK_SEQ) - dccp_set_seqno(&seqno, DCCP_SKB_CB(rxskb)->dccpd_ack_seq + 1); + seqno = ADD48(DCCP_SKB_CB(rxskb)->dccpd_ack_seq, 1); dccp_hdr_set_seq(dh, seqno); dccp_hdr_set_ack(dccp_hdr_ack_bits(skb), DCCP_SKB_CB(rxskb)->dccpd_seq); |