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/ar-internal.h | |
| 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/ar-internal.h')
| -rw-r--r-- | net/rxrpc/ar-internal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h index ea5600b747cc..b2151993d384 100644 --- a/net/rxrpc/ar-internal.h +++ b/net/rxrpc/ar-internal.h @@ -525,6 +525,7 @@ struct rxrpc_call { unsigned long flags; unsigned long events; spinlock_t lock; + spinlock_t notify_lock; /* Kernel notification lock */ rwlock_t state_lock; /* lock for state transition */ u32 abort_code; /* Local/remote abort code */ int error; /* Local error incurred */ |