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

Commit db0a9593 authored by Bryan Schumaker's avatar Bryan Schumaker Committed by Trond Myklebust
Browse files

NFS: Handle exceptions coming out of nfs4_proc_fs_locations() 



We don't want to return -NFS4ERR_WRONGSEC to the VFS because it could
cause the kernel to oops.

Signed-off-by: default avatarBryan Schumaker <bjschuma@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 31e4dda4

fs/nfs/nfs4proc.c

+14 −1
Original line number Diff line number Diff line
@@ -4921,7 +4921,7 @@ static void nfs_fixup_referral_attributes(struct nfs_fattr *fattr) 
	fattr->nlink = 2;

}



int nfs4_proc_fs_locations(struct inode *dir, const struct qstr *name,

static int _nfs4_proc_fs_locations(struct inode *dir, const struct qstr *name,

		struct nfs4_fs_locations *fs_locations, struct page *page)

{

	struct nfs_server *server = NFS_SERVER(dir);
@@ -4961,6 +4961,19 @@ int nfs4_proc_fs_locations(struct inode *dir, const struct qstr *name, 
	return status;

}



int nfs4_proc_fs_locations(struct inode *dir, const struct qstr *name,

		struct nfs4_fs_locations *fs_locations, struct page *page)

{

	struct nfs4_exception exception = { };

	int err;

	do {

		err = nfs4_handle_exception(NFS_SERVER(dir),

				_nfs4_proc_fs_locations(dir, name, fs_locations, page),

				&exception);

	} while (exception.retry);

	return err;

}



static int _nfs4_proc_secinfo(struct inode *dir, const struct qstr *name, struct nfs4_secinfo_flavors *flavors)

{

	int status;