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

Commit df7adeee authored by Trond Myklebust's avatar Trond Myklebust Committed by Greg Kroah-Hartman
Browse files

NFS: nfs_igrab_and_active must first reference the superblock 



commit 896567ee7f17a8a736cda8a28cc987228410a2ac upstream.

Before referencing the inode, we must ensure that the superblock can be
referenced. Otherwise, we can end up with iput() calling superblock
operations that are no longer valid or accessible.

Fixes: ea7c38fe ("NFSv4: Ensure we reference the inode for return-on-close in delegreturn")
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b2f9fbbc

fs/nfs/internal.h

+7 −5
Original line number Diff line number Diff line
@@ -575,12 +575,14 @@ extern int nfs4_test_session_trunk(struct rpc_clnt *, 


static inline struct inode *nfs_igrab_and_active(struct inode *inode)

{

	inode = igrab(inode);

	if (inode != NULL && !nfs_sb_active(inode->i_sb)) {

		iput(inode);

		inode = NULL;

	}

	struct super_block *sb = inode->i_sb;



	if (sb && nfs_sb_active(sb)) {

		if (igrab(inode))

			return inode;

		nfs_sb_deactive(sb);

	}

	return NULL;

}



static inline void nfs_iput_and_deactive(struct inode *inode)