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

Commit 2a9bc9bb authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[DCCP]: Transition from PARTOPEN to OPEN when receiving DATA packets 



Noticed by Andrea Bittau, that provided a patch that was modified to
not transition from RESPOND to OPEN when receiving DATA packets.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 777b25a2

net/dccp/input.c

+5 −1
Original line number Diff line number Diff line
@@ -375,6 +375,9 @@ static int dccp_rcv_respond_partopen_state_process(struct sock *sk, 
	case DCCP_PKT_RESET:

		inet_csk_clear_xmit_timer(sk, ICSK_TIME_DACK);

		break;

	case DCCP_PKT_DATA:

		if (sk->sk_state == DCCP_RESPOND)

			break;

	case DCCP_PKT_DATAACK:

	case DCCP_PKT_ACK:

		/*
@@ -393,7 +396,8 @@ static int dccp_rcv_respond_partopen_state_process(struct sock *sk, 
		dccp_sk(sk)->dccps_osr = DCCP_SKB_CB(skb)->dccpd_seq;

		dccp_set_state(sk, DCCP_OPEN);



		if (dh->dccph_type == DCCP_PKT_DATAACK) {

		if (dh->dccph_type == DCCP_PKT_DATAACK ||

		    dh->dccph_type == DCCP_PKT_DATA) {

			dccp_rcv_established(sk, skb, dh, len);

			queued = 1; /* packet was queued

				       (by dccp_rcv_established) */