Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bf55cda authored by Gerrit Renker's avatar Gerrit Renker Committed by David S. Miller
Browse files

[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: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: default avatarIan McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@ghostprotocols.net>
parent a94f0f97

net/dccp/ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

net/dccp/ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -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);