Commit 404d7794 authored by Anthony Iliopoulos's avatar Anthony Iliopoulos Committed by Chuck Lever
Browse files

nfsd: fix return error code for nfsd_map_name_to_[ug]id 



idmap lookups can time out while the cache is waiting for a userspace
upcall reply. In that case cache_check() returns -ETIMEDOUT to callers.

The nfsd_map_name_to_[ug]id functions currently proceed with attempting
to map the id to a kuid despite a potentially temporary failure to
perform the idmap lookup. This results in the code returning the error
NFSERR_BADOWNER which can cause client operations to return to userspace
with failure.

Fix this by returning the failure status before attempting kuid mapping.

This will return NFSERR_JUKEBOX on idmap lookup timeout so that clients
can retry the operation instead of aborting it.

Fixes: 65e10f6d ("nfsd: Convert idmap to use kuids and kgids")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarAnthony Iliopoulos <ailiop@suse.com>
Reviewed-by: default avatarNeilBrown <neil@brown.name>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent f9c206cd

fs/nfsd/nfs4idmap.c

+4 −0
Original line number Diff line number Diff line
@@ -672,6 +672,8 @@ __be32 nfsd_map_name_to_uid(struct svc_rqst *rqstp, const char *name, 
		return nfserr_inval;



	status = do_name_to_id(rqstp, IDMAP_TYPE_USER, name, namelen, &id);

	if (status)

		return status;

	*uid = make_kuid(nfsd_user_namespace(rqstp), id);

	if (!uid_valid(*uid))

		status = nfserr_badowner;
@@ -707,6 +709,8 @@ __be32 nfsd_map_name_to_gid(struct svc_rqst *rqstp, const char *name, 
		return nfserr_inval;



	status = do_name_to_id(rqstp, IDMAP_TYPE_GROUP, name, namelen, &id);

	if (status)

		return status;

	*gid = make_kgid(nfsd_user_namespace(rqstp), id);

	if (!gid_valid(*gid))

		status = nfserr_badowner;