From patchwork Fri Apr 17 15:14:20 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suresh Jayaraman X-Patchwork-Id: 18697 Received: from lists.samba.org (mail.samba.org [66.70.73.150]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n3HFEuSp028935 for ; Fri, 17 Apr 2009 15:14:57 GMT Received: from dp.samba.org (localhost [127.0.0.1]) by lists.samba.org (Postfix) with ESMTP id 18B3B163DD4 for ; Fri, 17 Apr 2009 15:14:36 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on dp.samba.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=3.8 tests=AWL, BAYES_00 autolearn=ham version=3.1.7 X-Original-To: linux-cifs-client@lists.samba.org Delivered-To: linux-cifs-client@lists.samba.org Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by lists.samba.org (Postfix) with ESMTP id 96771163B84 for ; Fri, 17 Apr 2009 15:14:12 +0000 (GMT) Received: from Relay1.suse.de (relay-ext.suse.de [195.135.221.8]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id C9B955FC9F; Fri, 17 Apr 2009 17:14:32 +0200 (CEST) Message-ID: <49E89CCC.2080800@suse.de> Date: Fri, 17 Apr 2009 20:44:20 +0530 From: Suresh Jayaraman User-Agent: Thunderbird 2.0.0.19 (X11/20081227) MIME-Version: 1.0 To: Steve French X-Enigmail-Version: 0.95.7 Cc: "linux-cifs-client@lists.samba.org" , Jeff Layton Subject: [linux-cifs-client] [PATCH 3/5] cifs: Make decode_unicode_ssetup use the helpers X-BeenThere: linux-cifs-client@lists.samba.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: The Linux CIFS VFS client List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-cifs-client-bounces+patchwork-cifs-client=patchwork.kernel.org@lists.samba.org Errors-To: linux-cifs-client-bounces+patchwork-cifs-client=patchwork.kernel.org@lists.samba.org In addition, remove the pointless "len >= words_left" check as rc is 0 always. Signed-off-by: Suresh Jayaraman --- fs/cifs/sess.c | 51 ++++++++++++++++----------------------------------- 1 files changed, 16 insertions(+), 35 deletions(-) diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index c652c73..a54b254 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c @@ -303,54 +303,35 @@ static int decode_unicode_ssetup(char **pbcc_area, int bleft, words_left = bleft / 2; /* save off server operating system */ - len = UniStrnlen((wchar_t *) data, words_left); - - if (len >= words_left) - return rc; - kfree(ses->serverOS); - /* UTF-8 string will not grow more than four times as big as UCS-16 */ - ses->serverOS = kzalloc((4 * len) + 2 /* trailing null */, GFP_KERNEL); - if (ses->serverOS != NULL) { - cifs_strfromUCS_le(ses->serverOS, (__le16 *)data, len, nls_cp); - cFYI(1, ("serverOS=%s", ses->serverOS)); - } + rc = cifs_ucs_to_nls(&(ses->serverOS), data, words_left, &len, nls_cp); + if (rc) + return rc; + cFYI(1, ("serverOS=%s", ses->serverOS)); data += 2 * (len + 1); words_left -= len + 1; /* save off server network operating system */ - len = UniStrnlen((wchar_t *) data, words_left); - - if (len >= words_left) - return rc; - kfree(ses->serverNOS); - ses->serverNOS = kzalloc((4 * len) + 2 /* trailing null */, GFP_KERNEL); - if (ses->serverNOS != NULL) { - cifs_strfromUCS_le(ses->serverNOS, (__le16 *)data, len, - nls_cp); - cFYI(1, ("serverNOS=%s", ses->serverNOS)); - if (strncmp(ses->serverNOS, "NT LAN Manager 4", 16) == 0) { - cFYI(1, ("NT4 server")); - ses->flags |= CIFS_SES_NT4; - } + rc = cifs_ucs_to_nls(&(ses->serverNOS), data, words_left, &len, nls_cp); + if (rc) + return rc; + cFYI(1, ("serverNOS=%s", ses->serverNOS)); + if (strncmp(ses->serverNOS, "NT LAN Manager 4", 16) == 0) { + cFYI(1, ("NT4 server")); + ses->flags |= CIFS_SES_NT4; } data += 2 * (len + 1); words_left -= len + 1; /* save off server domain */ - len = UniStrnlen((wchar_t *) data, words_left); - - if (len > words_left) + kfree(ses->serverDomain); + rc = cifs_ucs_to_nls(&(ses->serverDomain), data, words_left, &len, + nls_cp); + if (rc) return rc; + cFYI(1, ("serverDomain=%s", ses->serverDomain)); - kfree(ses->serverDomain); - ses->serverDomain = kzalloc((4 * len) + 2, GFP_KERNEL); - if (ses->serverDomain != NULL) { - cifs_strfromUCS_le(ses->serverDomain, (__le16 *)data, len, - nls_cp); - cFYI(1, ("serverDomain=%s", ses->serverDomain)); - } data += 2 * (len + 1); words_left -= len + 1;