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/call_event.c | |
| parent | 442866ff9743d51957685cecaa722a7fd47b02e2 (diff) | |
| parent | dcbefc30fbc2c1926bcecdd62579e3e107653d82 (diff) | |
| download | linux-166c88189632b6b13612dc15e031f58d199602da.tar.bz2 | |
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/call_event.c')
| -rw-r--r-- | net/rxrpc/call_event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rxrpc/call_event.c b/net/rxrpc/call_event.c index 7a77844aab16..3574508baf9a 100644 --- a/net/rxrpc/call_event.c +++ b/net/rxrpc/call_event.c @@ -386,7 +386,7 @@ recheck_state: now = ktime_get_real(); if (ktime_before(call->expire_at, now)) { - rxrpc_abort_call("EXP", call, 0, RX_CALL_TIMEOUT, -ETIME); + rxrpc_abort_call("EXP", call, 0, RX_USER_ABORT, -ETIME); set_bit(RXRPC_CALL_EV_ABORT, &call->events); goto recheck_state; } |