shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

nlm: Ensure callback code also checks that the files match

Browse Source 
am: 1f2f16c7b7

Change-Id: I43a97d53ff81c6eb8ae23b92ede80f3917806ede
This commit is contained in:
Trond Myklebust
2017-03-15 02:23:54 +00:00
committed by android-build-merger
parent 9e380d66bc 1f2f16c7b7
commit 49fe05a803
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/lockd/lockd.h
View File

@@ -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