Commit 9b5b1f5b authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NLM: Fix Oops in nlmclnt_mark_reclaim() 



 When mixing -olock and -onolock mounts on the same client, we have to
 check that fl->fl_u.nfs_fl.owner is set before dereferencing it.

 Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 48e49187

fs/lockd/clntlock.c

+4 −0
Original line number Diff line number Diff line
@@ -157,6 +157,8 @@ void nlmclnt_mark_reclaim(struct nlm_host *host) 
		inode = fl->fl_file->f_dentry->d_inode;

		if (inode->i_sb->s_magic != NFS_SUPER_MAGIC)

			continue;

		if (fl->fl_u.nfs_fl.owner == NULL)

			continue;

		if (fl->fl_u.nfs_fl.owner->host != host)

			continue;

		if (!(fl->fl_u.nfs_fl.flags & NFS_LCK_GRANTED))
@@ -226,6 +228,8 @@ reclaimer(void *ptr) 
		inode = fl->fl_file->f_dentry->d_inode;

		if (inode->i_sb->s_magic != NFS_SUPER_MAGIC)

			continue;

		if (fl->fl_u.nfs_fl.owner == NULL)

			continue;

		if (fl->fl_u.nfs_fl.owner->host != host)

			continue;

		if (!(fl->fl_u.nfs_fl.flags & NFS_LCK_RECLAIM))