From: "J. Bruce Fields" <bfields@fieldses.org>
To: Mi Jinlong <mijinlong@cn.fujitsu.com>
Cc: NFSv3 list <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH] NFSv4.1: Make sure nfsd can decode SP4_SSV correctly at exchange_id
Date: Fri, 12 Nov 2010 14:40:45 -0500 [thread overview]
Message-ID: <20101112194045.GD32745@fieldses.org> (raw)
In-Reply-To: <4CDB4516.1040707@cn.fujitsu.com>
On Thu, Nov 11, 2010 at 09:21:26AM +0800, Mi Jinlong wrote:
>
>
> J. Bruce Fields :
> > On Tue, Nov 09, 2010 at 09:39:23AM +0800, Mi Jinlong wrote:
> >> According to RFC, the argument of ssv_sp_parms4 is:
> >>
> >> struct ssv_sp_parms4 {
> >> state_protect_ops4 ssp_ops;
> >> sec_oid4 ssp_hash_algs<>;
> >> sec_oid4 ssp_encr_algs<>;
> >> uint32_t ssp_window;
> >> uint32_t ssp_num_gss_handles;
> >> };
> >>
> >> If client send a exchange_id with SP4_SSV, server cann't decode
> >> the SP4_SSV's ssp_hash_algs and ssp_encr_algs arguments correctly.
> >>
> >> Because the kernel treat the two arguments as a signal
> >> sec_oid4 struct, but should be a set of sec_oid4 struct.
> >
> > That looks correct, thanks.
> >
> > (How are you testing this?)
>
> I use the pynfs41 test site at your git tree. (EID50)
Got it, thanks; queueing for 2.6.38.
--b.
>
> thanks,
> Mi Jinlong
>
> >
> > --b.
> >
> >> Signed-off-by: Mi Jinlong <mijinlong@cn.fujitsu.com>
> >> ---
> >> fs/nfsd/nfs4xdr.c | 22 +++++++++++++++-------
> >> 1 files changed, 15 insertions(+), 7 deletions(-)
> >>
> >> diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
> >> index f35a94a..71d7d33 100644
> >> --- a/fs/nfsd/nfs4xdr.c
> >> +++ b/fs/nfsd/nfs4xdr.c
> >> @@ -1005,7 +1005,7 @@ static __be32
> >> nfsd4_decode_exchange_id(struct nfsd4_compoundargs *argp,
> >> struct nfsd4_exchange_id *exid)
> >> {
> >> - int dummy;
> >> + int dummy, tmp;
> >> DECODE_HEAD;
> >>
> >> READ_BUF(NFS4_VERIFIER_SIZE);
> >> @@ -1053,15 +1053,23 @@ nfsd4_decode_exchange_id(struct nfsd4_compoundargs *argp,
> >>
> >> /* ssp_hash_algs<> */
> >> READ_BUF(4);
> >> - READ32(dummy);
> >> - READ_BUF(dummy);
> >> - p += XDR_QUADLEN(dummy);
> >> + READ32(tmp);
> >> + while (tmp--) {
> >> + READ_BUF(4);
> >> + READ32(dummy);
> >> + READ_BUF(dummy);
> >> + p += XDR_QUADLEN(dummy);
> >> + }
> >>
> >> /* ssp_encr_algs<> */
> >> READ_BUF(4);
> >> - READ32(dummy);
> >> - READ_BUF(dummy);
> >> - p += XDR_QUADLEN(dummy);
> >> + READ32(tmp);
> >> + while (tmp--) {
> >> + READ_BUF(4);
> >> + READ32(dummy);
> >> + READ_BUF(dummy);
> >> + p += XDR_QUADLEN(dummy);
> >> + }
> >>
> >> /* ssp_window and ssp_num_gss_handles */
> >> READ_BUF(8);
> >> -- 1.7.0.1
> >>
> >> --
> >> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> >> the body of a message to majordomo@vger.kernel.org
> >> More majordomo info at http://vger.kernel.org/majordomo-info.html
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> >
> >
>
> --
> ----
> Regards
> Mi Jinlong
>
prev parent reply other threads:[~2010-11-12 19:40 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-05 7:33 [PATCH] NFSv4.1: Make sure nfsd can decode SP4_SSV correctly at exchange_id Mi Jinlong
2010-11-09 1:39 ` Mi Jinlong
2010-11-10 19:34 ` J. Bruce Fields
2010-11-11 1:21 ` Mi Jinlong
2010-11-12 19:40 ` J. Bruce Fields [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=20101112194045.GD32745@fieldses.org \
--to=bfields@fieldses.org \
--cc=linux-nfs@vger.kernel.org \
--cc=mijinlong@cn.fujitsu.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).