From f73516442df8a8efc406986ca92d333e661b5c1d Mon Sep 17 00:00:00 2001 From: Suresh Jayaraman Date: Mon, 20 Apr 2009 18:54:36 +0530 Subject: [PATCH] --- yaml --- r: 144692 b: refs/heads/master c: 7b0c8fcff47a885743125dd843db64af41af5a61 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/cifs/readdir.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 71ad132a782b..fed4f5a51887 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 968460ebd8006d55661dec0fb86712b40d71c413 +refs/heads/master: 7b0c8fcff47a885743125dd843db64af41af5a61 diff --git a/trunk/fs/cifs/readdir.c b/trunk/fs/cifs/readdir.c index 1a8be6228333..ebd0da7ecb3d 100644 --- a/trunk/fs/cifs/readdir.c +++ b/trunk/fs/cifs/readdir.c @@ -1074,7 +1074,7 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir) with the rare long characters alloc more to account for such multibyte target UTF-8 characters. cifs_unicode.c, which actually does the conversion, has the same limit */ - tmp_buf = kmalloc((2 * NAME_MAX) + 4, GFP_KERNEL); + tmp_buf = kmalloc((4 * NAME_MAX) + 2, GFP_KERNEL); for (i = 0; (i < num_to_fill) && (rc == 0); i++) { if (current_entry == NULL) { /* evaluate whether this case is an error */