Commit 251af29c authored Feb 11, 2017 by Trond Myklebust Committed by Anna Schumaker Feb 13, 2017

nlm: Ensure callback code also checks that the files match



It is not sufficient to just check that the lock pids match when
granting a callback, we also need to ensure that we're granting
the callback on the right file.

Reported-by: Pankaj Singh <psingh.ait@gmail.com>
Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Cc: stable@vger.kernel.org
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

parent b977b644

include/linux/lockd/lockd.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -355,7 +355,8 @@ static inline int nlm_privileged_requester(const struct svc_rqst *rqstp)
		static inline int nlm_compare_locks(const struct file_lock *fl1,
		const struct file_lock *fl2)
		{
		return fl1->fl_pid == fl2->fl_pid
		return file_inode(fl1->fl_file) == file_inode(fl2->fl_file)
		&& fl1->fl_pid == fl2->fl_pid
		&& fl1->fl_owner == fl2->fl_owner
		&& fl1->fl_start == fl2->fl_start
		&& fl1->fl_end == fl2->fl_end