Commit d28934ad authored Aug 18, 2008 by Gerrit Renker Committed by David S. Miller Aug 18, 2008

dccp: Fix panic caused by too early termination of retransmission mechanism

Thanks is due to Wei Yongjun for the detailed analysis and description of this
bug at http://marc.info/?l=dccp&m=121739364909199&w=2



The problem is that invalid packets received by a client in state REQUEST cause
the retransmission timer for the DCCP-Request to be reset. This includes freeing
the Request-skb ( in dccp_rcv_request_sent_state_process() ). As a consequence,
 * the arrival of further packets cause a double-free, triggering a panic(),
 * the connection then may hang, since further retransmissions are blocked.

This patch changes the order of statements so that the retransmission timer is
reset, and the pending Request freed, only if a valid Response has arrived (or
the number of sysctl-retries has been exhausted).

Further changes:
----------------
To be on the safe side, replaced __kfree_skb with kfree_skb so that if due to
unexpected circumstances the sk_send_head is NULL the WARN_ON is used instead.

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 4d8863a2

net/dccp/input.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -411,12 +411,6 @@ static int dccp_rcv_request_sent_state_process(struct sock *sk,
		struct dccp_sock *dp = dccp_sk(sk);
		long tstamp = dccp_timestamp();

		/* Stop the REQUEST timer */
		inet_csk_clear_xmit_timer(sk, ICSK_TIME_RETRANS);
		WARN_ON(sk->sk_send_head == NULL);
		__kfree_skb(sk->sk_send_head);
		sk->sk_send_head = NULL;

		if (!between48(DCCP_SKB_CB(skb)->dccpd_ack_seq,
		dp->dccps_awl, dp->dccps_awh)) {
		dccp_pr_debug("invalid ackno: S.AWL=%llu, "
		@@ -441,6 +435,12 @@ static int dccp_rcv_request_sent_state_process(struct sock *sk,
		DCCP_ACKVEC_STATE_RECEIVED))
		goto out_invalid_packet; /* FIXME: change error code */

		/* Stop the REQUEST timer */
		inet_csk_clear_xmit_timer(sk, ICSK_TIME_RETRANS);
		WARN_ON(sk->sk_send_head == NULL);
		kfree_skb(sk->sk_send_head);
		sk->sk_send_head = NULL;

		dp->dccps_isr = DCCP_SKB_CB(skb)->dccpd_seq;
		dccp_update_gsr(sk, dp->dccps_isr);
		/*

Admin message