nfsd: nfsd_file_lease_notifier_call gets a file_lease as an argument

jtlayton · chucklever · commit 769d20028f45 · 2024-07-12T12:58:48.000-04:00
"data" actually refers to a file_lease and not a file_lock. Both structs have their file_lock_core as the first field though, so this bug should be harmless without struct randomization in play. Reported-by: Florian Evers <florian-evers@gmx.de> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219008 Fixes: 05580bb ("nfsd: adapt to breakup of struct file_lock") Signed-off-by: Jeff Layton <jlayton@kernel.org> Tested-by: Florian Evers <florian-evers@gmx.de> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c
@@ -664,7 +664,7 @@ static int
 nfsd_file_lease_notifier_call(struct notifier_block *nb, unsigned long arg,
 			    void *data)
 {
-	struct file_lock *fl = data;
+	struct file_lease *fl = data;
 
 	/* Only close files for F_SETLEASE leases */
 	if (fl->c.flc_flags & FL_LEASE)

Original file line number	Diff line number	Diff line change
`@@ -664,7 +664,7 @@ static int`
`664`	`664`	`nfsd_file_lease_notifier_call(struct notifier_block *nb, unsigned long arg,`
`665`	`665`	`void *data)`
`666`	`666`	`{`
`667`		`- struct file_lock *fl = data;`
	`667`	`+ struct file_lease *fl = data;`
`668`	`668`
`669`	`669`	`/* Only close files for F_SETLEASE leases */`
`670`	`670`	`if (fl->c.flc_flags & FL_LEASE)`