diff options
| author | David S. Miller <davem@davemloft.net> | 2017-11-14 16:17:38 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-14 16:17:38 +0900 |
| commit | 166c88189632b6b13612dc15e031f58d199602da (patch) | |
| tree | 2380e848d36cc85e915901acc3d428f6001e7885 /net/rxrpc/input.c | |
| parent | 442866ff9743d51957685cecaa722a7fd47b02e2 (diff) | |
| parent | dcbefc30fbc2c1926bcecdd62579e3e107653d82 (diff) | |
Merge tag 'rxrpc-next-20171111' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
David Howells says:
====================
rxrpc: Fixes
Here are some patches that fix some things in AF_RXRPC:
(1) Prevent notifications from being passed to a kernel service for a call
that it has ended.
(2) Fix a null pointer deference that occurs under some circumstances when an
ACK is generated.
(3) Fix a number of things to do with call expiration.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rxrpc/input.c')
| -rw-r--r-- | net/rxrpc/input.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c index 1e37eb1c0c66..1b592073ec96 100644 --- a/net/rxrpc/input.c +++ b/net/rxrpc/input.c @@ -298,8 +298,6 @@ static bool rxrpc_end_tx_phase(struct rxrpc_call *call, bool reply_begun, write_unlock(&call->state_lock); if (call->state == RXRPC_CALL_CLIENT_AWAIT_REPLY) { - rxrpc_propose_ACK(call, RXRPC_ACK_IDLE, 0, 0, false, true, - rxrpc_propose_ack_client_tx_end); trace_rxrpc_transmit(call, rxrpc_transmit_await_reply); } else { trace_rxrpc_transmit(call, rxrpc_transmit_end); |