diff options
| author |   David Howells <dhowells@redhat.com> | 2016-08-24 13:06:14 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2016-08-24 13:06:14 +0100 |
| commit | 2266ffdef5737fdfa96005204fc5606dbd559956 (patch) | |
| tree | d56e7e0fecb29ebd45772460e3e248084cb58eab /net/rxrpc/input.c | |
| parent | net: diag: support SOCK_DESTROY for UDP sockets (diff) | |
| download | linux-dev-2266ffdef5737fdfa96005204fc5606dbd559956.tar.xz linux-dev-2266ffdef5737fdfa96005204fc5606dbd559956.zip | |
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: 18bfeba50dfd0c8ee420396f2570f16a0bdbd7de ("rxrpc: Perform terminal call ACK/ABORT retransmission from conn processor")
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc/input.c')
| -rw-r--r-- | net/rxrpc/input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c index 66cdeb56f44f..5e683dd21ab9 100644 --- a/net/rxrpc/input.c +++ b/net/rxrpc/input.c @@ -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; |