From: "J. Bruce Fields" <bfields@fieldses.org>
To: Olga Kornievskaia <olga.kornievskaia@gmail.com>
Cc: bfields@redhat.com, linux-nfs@vger.kernel.org
Subject: Re: [PATCH 2/3] NFSD fix nfserro errno mismatch
Date: Thu, 5 Dec 2019 16:43:18 -0500 [thread overview]
Message-ID: <20191205214318.GC29765@fieldses.org> (raw)
In-Reply-To: <20191205213930.GB29765@fieldses.org>
On Thu, Dec 05, 2019 at 04:39:30PM -0500, bfields wrote:
> On Wed, Dec 04, 2019 at 03:13:53PM -0500, Olga Kornievskaia wrote:
> > There is mismatch between __be32 and u32 in nfserr and errno.
> >
> ...
> > @@ -1280,7 +1279,7 @@ extern struct file *nfs42_ssc_open(struct vfsmount *ss_mnt,
> >
> > copy->c_fh.size = s_fh->fh_handle.fh_size;
> > memcpy(copy->c_fh.data, &s_fh->fh_handle.fh_base, copy->c_fh.size);
> > - copy->stateid.seqid = s_stid->si_generation;
> > + copy->stateid.seqid = cpu_to_be32(s_stid->si_generation);
>
> This one isn't an errno, and should really be its own patch. I've split
> it out as follows.--b.
(And applied the others, thanks.)
>
> commit a1f3cb8bb088
> Author: Olga Kornievskaia <olga.kornievskaia@gmail.com>
> Date: Wed Dec 4 15:13:53 2019 -0500
>
> NFSD: fix seqid in copy stateid
>
> s_stid->si_generation is a u32, copy->stateid.seqid is a __be32, so we
> should be byte-swapping here if necessary.
>
> This effectively undoes the byte-swap performed when reading
> s_stid->s_generation in nfsd4_decode_copy(). Without this second swap,
> the stateid we sent to the source in READ could be different from the
> one the client provided us in the COPY. We didn't spot this in testing
> since our implementation always uses a 0 in the seqid field. But other
> implementations might not do that.
>
> You'd think we should just skip the byte-swapping entirely, but the
> s_stid field can be used for either our own stateids (in the
> intra-server case) or foreign stateids (in the inter-server case), and
> the former are interpreted by us and need byte-swapping.
>
> Reported-by: kbuild test robot <lkp@intel.com>
> Fixes: d5e54eeb0e3d ("NFSD add nfs4 inter ssc to nfsd4_copy")
> Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
>
> diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
> index ec4f79c8f71e..9a8debc0d725 100644
> --- a/fs/nfsd/nfs4proc.c
> +++ b/fs/nfsd/nfs4proc.c
> @@ -1280,7 +1280,7 @@ nfsd4_setup_inter_ssc(struct svc_rqst *rqstp,
>
> copy->c_fh.size = s_fh->fh_handle.fh_size;
> memcpy(copy->c_fh.data, &s_fh->fh_handle.fh_base, copy->c_fh.size);
> - copy->stateid.seqid = s_stid->si_generation;
> + copy->stateid.seqid = cpu_to_be32(s_stid->si_generation);
> memcpy(copy->stateid.other, (void *)&s_stid->si_opaque,
> sizeof(stateid_opaque_t));
>
next prev parent reply other threads:[~2019-12-05 21:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-04 20:13 [PATCH 0/3] NFSD copy offload fixes Olga Kornievskaia
2019-12-04 20:13 ` [PATCH 1/3] NFSD fix mismatching type in nfsd4_set_netaddr Olga Kornievskaia
2019-12-04 20:13 ` [PATCH 2/3] NFSD fix nfserro errno mismatch Olga Kornievskaia
2019-12-05 21:39 ` J. Bruce Fields
2019-12-05 21:43 ` J. Bruce Fields [this message]
2019-12-04 20:13 ` [PATCH 3/3] NFSD fixing possible null pointer derefering in copy offload Olga Kornievskaia
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=20191205214318.GC29765@fieldses.org \
--to=bfields@fieldses.org \
--cc=bfields@redhat.com \
--cc=linux-nfs@vger.kernel.org \
--cc=olga.kornievskaia@gmail.com \
/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).