[ Upstream commit 7917f01a286ce01e9c085e24468421f596ee1a0c ]
A recent patch inadvertently broke callbacks for NFSv4.0.
In the 4.0 case we do not expect a session to be found but still need to
call setup_callback_client() which will not try to dereference it.
This patch moves the check for failure to find a session into the 4.1+
branch of setup_callback_client()
Fixes: 1e02c641c3a4 ("NFSD: Prevent NULL dereference in nfsd4_process_cb_update()")
Signed-off-by: NeilBrown <neilb@suse.de>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
|
||
|---|---|---|
| .. | ||
| acl.h | ||
| auth.c | ||
| auth.h | ||
| blocklayout.c | ||
| blocklayoutxdr.c | ||
| blocklayoutxdr.h | ||
| cache.h | ||
| current_stateid.h | ||
| export.c | ||
| export.h | ||
| fault_inject.c | ||
| filecache.c | ||
| filecache.h | ||
| flexfilelayout.c | ||
| flexfilelayoutxdr.c | ||
| flexfilelayoutxdr.h | ||
| idmap.h | ||
| Kconfig | ||
| lockd.c | ||
| Makefile | ||
| netns.h | ||
| nfs2acl.c | ||
| nfs3acl.c | ||
| nfs3proc.c | ||
| nfs3xdr.c | ||
| nfs4acl.c | ||
| nfs4callback.c | ||
| nfs4idmap.c | ||
| nfs4layouts.c | ||
| nfs4proc.c | ||
| nfs4recover.c | ||
| nfs4state.c | ||
| nfs4xdr.c | ||
| nfscache.c | ||
| nfsctl.c | ||
| nfsd.h | ||
| nfsfh.c | ||
| nfsfh.h | ||
| nfsproc.c | ||
| nfssvc.c | ||
| nfsxdr.c | ||
| pnfs.h | ||
| state.h | ||
| stats.c | ||
| stats.h | ||
| trace.c | ||
| trace.h | ||
| vfs.c | ||
| vfs.h | ||
| xdr.h | ||
| xdr3.h | ||
| xdr4.h | ||
| xdr4cb.h | ||