On Fri, 4 Apr 2014 09:51:11 -0400
Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx> wrote:
>
> On Apr 4, 2014, at 6:00, Jeff Layton <jlayton@xxxxxxxxxx> wrote:
>
> > There is no guarantee that the strings in the nfs_cache_array will be
> > NULL-terminated. In the event that we end up hitting a readdir loop, we
> > need to ensure that we pass the warning message a properly-terminated
> > string.
> >
> > Reported-by: Lachlan McIlroy <lmcilroy@xxxxxxxxxx>
> > Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
> > ---
> > fs/nfs/dir.c | 7 ++++---
> > 1 file changed, 4 insertions(+), 3 deletions(-)
> >
> > diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
> > index 5c0b6ecc3a88..4689b125f9fe 100644
> > --- a/fs/nfs/dir.c
> > +++ b/fs/nfs/dir.c
> > @@ -304,12 +304,13 @@ int nfs_readdir_search_for_cookie(struct nfs_cache_array *array, nfs_readdir_des
> > if (ctx->duped > 0
> > && ctx->dup_cookie == *desc->dir_cookie) {
> > if (printk_ratelimit()) {
> > + char *name = kstrndup(array->array[i].string.name, array->array[i].string.len, GFP_KERNEL);
> > +
> > pr_notice("NFS: directory %pD2 contains a readdir loop."
> > "Please contact your server vendor. "
> > "The file: %s has duplicate cookie %llu\n",
> > - desc->file,
> > - array->array[i].string.name,
> > - *desc->dir_cookie);
> > + desc->file, name, *desc->dir_cookie);
> > + kfree(name);
> > }
>
> Umm… Any reason why we couldn’t just use ‘%.*s’ ?
>
No reason at all. I had never run across that...
I'll respin and repost -- thanks!
--
Jeff Layton <jlayton@xxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
