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

Commit ce510193 authored by Josh Triplett's avatar Josh Triplett Committed by Trond Myklebust
Browse files

NFS: Release dcache_lock in an error path of nfs_path 



In one of the error paths of nfs_path, it may return with dcache_lock still
held; fix this by adding and using a new error path Elong_unlock which unlocks
dcache_lock.

Signed-off-by: default avatarJosh Triplett <josh@freedesktop.org>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
(cherry picked from f4b90b43677fb23297c56802c3056fc304f988d9 commit)
parent 3f2792ff

fs/nfs/namespace.c

+3 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ char *nfs_path(const char *base, const struct dentry *dentry, 
		namelen = dentry->d_name.len;

		buflen -= namelen + 1;

		if (buflen < 0)

			goto Elong;

			goto Elong_unlock;

		end -= namelen;

		memcpy(end, dentry->d_name.name, namelen);

		*--end = '/';
@@ -68,6 +68,8 @@ char *nfs_path(const char *base, const struct dentry *dentry, 
	end -= namelen;

	memcpy(end, base, namelen);

	return end;

Elong_unlock:

	spin_unlock(&dcache_lock);

Elong:

	return ERR_PTR(-ENAMETOOLONG);

}