From: Chuck Lever III <chuck.lever@oracle.com>
To: Benjamin Coddington <bcodding@redhat.com>
Cc: Bruce Fields <bfields@fieldses.org>,
Linux NFS Mailing List <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH V2] lockd: Fix invalid lockowner cast after vfs_test_lock
Date: Mon, 26 Jul 2021 14:42:27 +0000 [thread overview]
Message-ID: <0B397787-45A2-4469-B48C-3A1182B24307@oracle.com> (raw)
In-Reply-To: <a060024e4cde48b224a7b4aecae7d20423ce506f.1627306204.git.bcodding@redhat.com>
Hi Ben-
> On Jul 26, 2021, at 9:33 AM, Benjamin Coddington <bcodding@redhat.com> wrote:
>
> V2: fix typos in patch header
>
> 8<-------------------------------------------------------
>
> 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: 646d73e91b42 ("lockd: Show pid of lockd for remote locks")
> Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
I've added this change provisionally to
https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git/log/?h=for-next
> ---
> fs/lockd/svclock.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
> index 61d3cc2283dc..498cb70c2c0d 100644
> --- a/fs/lockd/svclock.c
> +++ b/fs/lockd/svclock.c
> @@ -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;
> --
> 2.30.2
>
--
Chuck Lever
prev parent reply other threads:[~2021-07-26 14:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-25 12:49 [PATCH] lockd: Fix invalid lockowner cast after vfs_test_lock Benjamin Coddington
2021-07-26 13:33 ` [PATCH V2] " Benjamin Coddington
2021-07-26 14:42 ` Chuck Lever III [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0B397787-45A2-4469-B48C-3A1182B24307@oracle.com \
--to=chuck.lever@oracle.com \
--cc=bcodding@redhat.com \
--cc=bfields@fieldses.org \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).