[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <1171476286.3336.9.camel@localhost.localdomain>
Date: Wed, 14 Feb 2007 13:04:46 -0500
From: Ming Zhang <blackmagic02881@...il.com>
To: chuck.lever@...cle.com
Cc: NeilBrown <neilb@...e.de>,
Andrew Morton <akpm@...ux-foundation.org>,
nfs@...ts.sourceforge.net, linux-kernel@...r.kernel.org
Subject: Re: [NFS] [PATCH 001 of 9] knfsd: nfsd4: fix non-terminated string
On Wed, 2007-02-14 at 09:55 -0800, Chuck Lever wrote:
> Ming Zhang wrote:
> > On Tue, 2007-02-13 at 10:44 +1100, NeilBrown wrote:
> >> From: J. Bruce Fields <bfields@...i.umich.edu>
> >> The server name is expected to be a null-terminated string, so we can't
> >> pass in the raw client identifier.
> >>
> >> What's more, the client identifier is just a binary, not necessarily
> >> printable, blob. Let's just use the ip address instead. The server
> >> name appears to exist just to help debugging by making some printk's
> >> more informative.
> >>
> >> Note that the string is copies into the rpc client structure, so
> >> the pointer to the local variable does not outlive the function call.
> >>
> >> Signed-off-by: "J. Bruce Fields" <bfields@...i.umich.edu>
> >> Signed-off-by: Neil Brown <neilb@...e.de>
> >>
> >> ### Diffstat output
> >> ./fs/nfsd/nfs4callback.c | 7 ++++++-
> >> 1 file changed, 6 insertions(+), 1 deletion(-)
> >>
> >> diff .prev/fs/nfsd/nfs4callback.c ./fs/nfsd/nfs4callback.c
> >> --- .prev/fs/nfsd/nfs4callback.c 2007-02-13 09:50:26.000000000 +1100
> >> +++ ./fs/nfsd/nfs4callback.c 2007-02-13 10:00:59.000000000 +1100
> >> @@ -387,7 +387,6 @@ nfsd4_probe_callback(struct nfs4_client
> >> .address = (struct sockaddr *)&addr,
> >> .addrsize = sizeof(addr),
> >> .timeout = &timeparms,
> >> - .servername = clp->cl_name.data,
> >> .program = program,
> >> .version = nfs_cb_version[1]->number,
> >> .authflavor = RPC_AUTH_UNIX, /* XXX: need AUTH_GSS... */
> >> @@ -397,6 +396,7 @@ nfsd4_probe_callback(struct nfs4_client
> >> .rpc_proc = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_NULL],
> >> .rpc_argp = clp,
> >> };
> >> + char clientname[16];
> >> int status;
> >>
> >> if (atomic_read(&cb->cb_set))
> >> @@ -419,6 +419,11 @@ nfsd4_probe_callback(struct nfs4_client
> >> memset(program->stats, 0, sizeof(cb->cb_stat));
> >> program->stats->program = program;
> >>
> >> + /* Just here to make some printk's more useful: */
> >> + snprintf(clientname, sizeof(clientname),
> >> + "%u.%u.%u.%u", NIPQUAD(addr.sin_addr));
> >
> > can use NIPQUAD_FMT here instead of "%u.%u.%u.%u".
> >
> > btw, will the ip address here possibly be an ipv6 address?
>
> Some patches are in the works to build in IPv6 support. See the patch
> series at http://oss.oracle.com/~cel/linux-2.6/2.6.19/patches/
thanks for the info.
--
http://blackmagic02881.wordpress.com/
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists