| From 88d15db4ebd430820be17f949be375bb76028131 Mon Sep 17 00:00:00 2001 |
| From: Trond Myklebust <trond.myklebust@primarydata.com> |
| Date: Sat, 11 Feb 2017 10:37:38 -0500 |
| Subject: [PATCH] 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 <psingh.ait@gmail.com> |
| Fixes: 1da177e4c3f4 ("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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| 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 |
| -- |
| 2.12.0 |
| |
