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

Commit 81e69d3f authored by Benjamin Coddington's avatar Benjamin Coddington Committed by Greg Kroah-Hartman
Browse files

lockd: Fix invalid lockowner cast after vfs_test_lock 



[ Upstream commit cd2d644ddba183ec7b451b7c20d5c7cc06fcf0d7 ]

After calling vfs_test_lock() the pointer to a conflicting lock can be
returned, and that lock is not guarunteed to be owned by nlm.  In that
case, we cannot cast it to struct nlm_lockowner.  Instead return the pid
of that conflicting lock.

Fixes: 646d73e9 ("lockd: Show pid of lockd for remote locks")
Signed-off-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e1c02e2e

fs/lockd/svclock.c

+1 −1
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file, 
	conflock->caller = "somehost";	/* FIXME */

	conflock->len = strlen(conflock->caller);

	conflock->oh.len = 0;		/* don't return OH info */

	conflock->svid = ((struct nlm_lockowner *)lock->fl.fl_owner)->pid;

	conflock->svid = lock->fl.fl_pid;

	conflock->fl.fl_type = lock->fl.fl_type;

	conflock->fl.fl_start = lock->fl.fl_start;

	conflock->fl.fl_end = lock->fl.fl_end;