Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49fe05a8 authored by Trond Myklebust's avatar Trond Myklebust Committed by android-build-merger
Browse files

nlm: Ensure callback code also checks that the files match 

am: 1f2f16c7

Change-Id: I43a97d53ff81c6eb8ae23b92ede80f3917806ede
parents 9e380d66 1f2f16c7

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