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: Ubuntu-4.10.0-14.16~44 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3e62d3dfd8a2f485e462841329f40f7fd8e221b7;p=mirror_ubuntu-zesty-kernel.git nlm: Ensure callback code also checks that the files match BugLink: http://bugs.launchpad.net/bugs/1673118 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 Signed-off-by: Greg Kroah-Hartman Signed-off-by: Tim Gardner --- diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h index c15373894a42..b37dee3acaba 100644 --- a/include/linux/lockd/lockd.h +++ b/include/linux/lockd/lockd.h @@ -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