Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdb2e53f authored by Dan Carpenter's avatar Dan Carpenter Committed by Trond Myklebust
Browse files

NFS: Cleanup error handling in nfs_idmap_request_key() 



nfs_idmap_get_desc() can't actually return zero.  But if it did then
we would return ERR_PTR(0) which is NULL and the caller,
nfs_idmap_get_key(), doesn't expect that so it leads to a NULL pointer
dereference.

I've cleaned this up by changing the "<=" to "<" so it's more clear that
we don't return ERR_PTR(0).

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 35c036ef

fs/nfs/nfs4idmap.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -274,7 +274,7 @@ static struct key *nfs_idmap_request_key(const char *name, size_t namelen, 
	ssize_t ret;

	ssize_t ret;





	ret = nfs_idmap_get_desc(name, namelen, type, strlen(type), &desc);

	ret = nfs_idmap_get_desc(name, namelen, type, strlen(type), &desc);

	if (ret <= 0)

	if (ret < 0)

		return ERR_PTR(ret);

		return ERR_PTR(ret);





	rkey = request_key(&key_type_id_resolver, desc, "");

	rkey = request_key(&key_type_id_resolver, desc, "");