| Message ID | 49EC7794.50603@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 20 Apr 2009 18:54:36 +0530 Suresh Jayaraman <sjayaraman@suse.de> wrote: > Increase size of tmp_buf to possible maximum to avoid potential > overflows. > > > Pointed-out-by: Jeff Layton <jlayton@redhat.com> > Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de> > --- > fs/cifs/readdir.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c > index 1a8be62..ebd0da7 100644 > --- a/fs/cifs/readdir.c > +++ b/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 */ Acked-by: Jeff Layton <jlayton@redhat.com>
Merged this and also patch 1 of 2 thx On Mon, Apr 20, 2009 at 10:30 AM, Jeff Layton <jlayton@redhat.com> wrote: > On Mon, 20 Apr 2009 18:54:36 +0530 > Suresh Jayaraman <sjayaraman@suse.de> wrote: > >> Increase size of tmp_buf to possible maximum to avoid potential >> overflows. >> >> >> Pointed-out-by: Jeff Layton <jlayton@redhat.com> >> Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de> >> --- >> Â fs/cifs/readdir.c | Â Â 2 +- >> Â 1 files changed, 1 insertions(+), 1 deletions(-) >> >> diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c >> index 1a8be62..ebd0da7 100644 >> --- a/fs/cifs/readdir.c >> +++ b/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 */ > > Acked-by: Jeff Layton <jlayton@redhat.com> >
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c index 1a8be62..ebd0da7 100644 --- a/fs/cifs/readdir.c +++ b/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 */
Increase size of tmp_buf to possible maximum to avoid potential overflows. Pointed-out-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de> --- fs/cifs/readdir.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)