diff options
| author | Andrey Ryabinin | 2015-09-23 14:49:29 +0200 |
|---|---|---|
| committer | J. Bruce Fields | 2015-10-12 23:31:05 +0200 |
| commit | 0ad95472bf169a3501991f8f33f5147f792a8116 (patch) | |
| tree | 3c2303ba0350c2dcd54db07c9883954ed9092c49 /fs/lockd/netns.h | |
| parent | nfsd: switch unsigned char flags in svc_fh to bools (diff) | |
| download | kernel-qcow2-linux-0ad95472bf169a3501991f8f33f5147f792a8116.tar.gz kernel-qcow2-linux-0ad95472bf169a3501991f8f33f5147f792a8116.tar.xz kernel-qcow2-linux-0ad95472bf169a3501991f8f33f5147f792a8116.zip | |
lockd: create NSM handles per net namespace
Commit cb7323fffa85 ("lockd: create and use per-net NSM
RPC clients on MON/UNMON requests") introduced per-net
NSM RPC clients. Unfortunately this doesn't make any sense
without per-net nsm_handle.
E.g. the following scenario could happen
Two hosts (X and Y) in different namespaces (A and B) share
the same nsm struct.
1. nsm_monitor(host_X) called => NSM rpc client created,
nsm->sm_monitored bit set.
2. nsm_mointor(host-Y) called => nsm->sm_monitored already set,
we just exit. Thus in namespace B ln->nsm_clnt == NULL.
3. host X destroyed => nsm->sm_count decremented to 1
4. host Y destroyed => nsm_unmonitor() => nsm_mon_unmon() => NULL-ptr
dereference of *ln->nsm_clnt
So this could be fixed by making per-net nsm_handles list,
instead of global. Thus different net namespaces will not be able
share the same nsm_handle.
Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/lockd/netns.h')
| -rw-r--r-- | fs/lockd/netns.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/lockd/netns.h b/fs/lockd/netns.h index 097bfa3adb1c..89fe011b1335 100644 --- a/fs/lockd/netns.h +++ b/fs/lockd/netns.h @@ -15,6 +15,7 @@ struct lockd_net { spinlock_t nsm_clnt_lock; unsigned int nsm_users; struct rpc_clnt *nsm_clnt; + struct list_head nsm_handles; }; extern int lockd_net_id; |