]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
nfsd: nfsd_file_lease_notifier_call gets a file_lease as an argument
authorJeff Layton <jlayton@kernel.org>
Fri, 12 Jul 2024 11:26:44 +0000 (07:26 -0400)
committerChuck Lever <chuck.lever@oracle.com>
Fri, 12 Jul 2024 16:58:48 +0000 (12:58 -0400)
"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: 05580bbfc6bc ("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>
fs/nfsd/filecache.c

index ad9083ca144ba2c3a1469d89b126a70db2011b61..f4704f5d4086758a63888dc8f1a3aaa727263055 100644 (file)
@@ -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)