From: Trond Myklebust Date: Sat, 11 Feb 2017 15:37:38 +0000 (-0500) Subject: nlm: Ensure callback code also checks that the files match X-Git-Tag: v3.2.89~54 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=be1fba0a20485d78d98a2642f2cf658e09502736;hp=a44059c1c1fac3c721fa0c34bd2de8b4853fd1a3 nlm: Ensure callback code also checks that the files match commit 251af29c320d86071664f02c76f0d063a19fefdf upstream. 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 Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Trond Myklebust Signed-off-by: Anna Schumaker [bwh: Backported to 3.2: open-code file_inode()] Signed-off-by: Ben Hutchings --- diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h index ff9abff55aa0..92f64c413c3d 100644 --- a/include/linux/lockd/lockd.h +++ b/include/linux/lockd/lockd.h @@ -348,7 +348,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 fl1->fl_file->f_dentry->d_inode == fl2->fl_file->f_dentry->d_inode + && fl1->fl_pid == fl2->fl_pid && fl1->fl_owner == fl2->fl_owner && fl1->fl_start == fl2->fl_start && fl1->fl_end == fl2->fl_end