Commit 2266ffde authored Aug 24, 2016 by David Howells

rxrpc: Fix conn-based retransmit

If a duplicate packet comes in for a call that has just completed on a
connection's channel then there will be an oops in the data_ready handler
because it tries to examine the connection struct via a call struct (which
we don't have - the pointer is unset).

Since the connection struct pointer is available to us, go direct instead.

Also, the ACK packet to be retransmitted needs three octets of padding
between the soft ack list and the ackinfo.

Fixes: 18bfeba5 ("rxrpc: Perform terminal call ACK/ABORT retransmission from conn processor")
Signed-off-by: David Howells <dhowells@redhat.com>

parent 5d77dca8

net/rxrpc/conn_event.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ static void rxrpc_conn_retransmit(struct rxrpc_connection *conn,
		} abort;
		struct {
		struct rxrpc_ackpacket ack;
		u8 padding[3];
		struct rxrpc_ackinfo info;
		};
		};

net/rxrpc/input.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -732,7 +732,7 @@ void rxrpc_data_ready(struct sock *sk)
		/* For the previous service call, if completed
		* successfully, we discard all further packets.
		*/
		if (rxrpc_conn_is_service(call->conn) &&
		if (rxrpc_conn_is_service(conn) &&
		(chan->last_type == RXRPC_PACKET_TYPE_ACK \|\|
		sp->hdr.type == RXRPC_PACKET_TYPE_ABORT))
		goto discard_unlock;