From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763424AbZENXLz (ORCPT ); Thu, 14 May 2009 19:11:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762351AbZENW7C (ORCPT ); Thu, 14 May 2009 18:59:02 -0400 Received: from kroah.org ([198.145.64.141]:46095 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762271AbZENW6n (ORCPT ); Thu, 14 May 2009 18:58:43 -0400 X-Mailbox-Line: From gregkh@mini.kroah.org Thu May 14 15:52:39 2009 Message-Id: <20090514225239.332848697@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Thu, 14 May 2009 15:51:44 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , Rodrigo Rubira Branco , Jake Edge , Eugene Teo , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Steve French , Jeff Layton , Suresh Jayaraman , Steve French Subject: [patch 18/28] cifs: Fix buffer size in cifs_convertUCSpath References: <20090514225126.907908936@mini.kroah.org> Content-Disposition: inline; filename=cifs-fix-buffer-size-in-cifs_convertucspath.patch In-Reply-To: <20090514225413.GA705@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.27-stable review patch. If anyone has any objections, please let us know. ------------------ From: Suresh Jayaraman Relevant commits 7fabf0c9479fef9fdb9528a5fbdb1cb744a744a4 and f58841666bc22e827ca0dcef7b71c7bc2758ce82. The upstream commits adds cifs_from_ucs2 that includes functionality of cifs_convertUCSpath and does cleanup. Reported-by: Jeff Layton Signed-off-by: Suresh Jayaraman Acked-by: Steve French Acked-by: Jeff Layton Signed-off-by: Greg Kroah-Hartman --- fs/cifs/misc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/fs/cifs/misc.c +++ b/fs/cifs/misc.c @@ -685,14 +685,15 @@ cifs_convertUCSpath(char *target, const NLS_MAX_CHARSET_SIZE); if (len > 0) { j += len; - continue; + goto overrun_chk; } else { target[j] = '?'; } } j++; /* make sure we do not overrun callers allocated temp buffer */ - if (j >= (2 * NAME_MAX)) +overrun_chk: + if (j >= UNICODE_NAME_MAX) break; } cUCS_out: