From patchwork Tue Oct 5 00:56:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shirish Pargaonkar X-Patchwork-Id: 231001 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o95112RM012027 for ; Tue, 5 Oct 2010 01:01:02 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755268Ab0JEBBB (ORCPT ); Mon, 4 Oct 2010 21:01:01 -0400 Received: from mail-iw0-f174.google.com ([209.85.214.174]:50779 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752811Ab0JEBBA (ORCPT ); Mon, 4 Oct 2010 21:01:00 -0400 Received: by iwn5 with SMTP id 5so7598678iwn.19 for ; Mon, 04 Oct 2010 18:01:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=Kn52Fa4gahfyW9cUT2An8do0MqmXrURNEb9mpPpvZ5U=; b=fZjRn8O5ySCJOAlHzTcaHJY2bfZBHKf4byhqhUrBsvoODWrlG/GXDtO2V8eQLaTz4S HoZdCmmb8xldqgwzIdAljZwTywt/TF+i82slGWFZd9Psrl/TnWrg1dOvmR7IDxOB0QC+ lFLDjKZSCDPA++phxomZBj+LDmSLlT5YlnJpY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=Lp/1eIwHxKUN1G9qBuMFDaIzuMcPnYZzPix0+/Ur5F8IRbjjEGXZDmvCQGxDEm/TB9 gLzLY8HJnQafRWVZtwqNSRvgOkDxoBo046eGFzpZT6Kb3YwNo8Ez2k9Xk+kKeVwtuT87 Ovh4N9hGHAXoXoo/9IAcdT6oyjt5tOg8w9H8M= Received: by 10.231.58.201 with SMTP id i9mr11127516ibh.98.1286240460212; Mon, 04 Oct 2010 18:01:00 -0700 (PDT) Received: from localhost ([32.97.110.58]) by mx.google.com with ESMTPS id u6sm3940104ibd.0.2010.10.04.18.00.59 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 04 Oct 2010 18:00:59 -0700 (PDT) From: shirishpargaonkar@gmail.com To: smfrench@gmail.com Cc: linux-cifs@vger.kernel.org, Shirish Pargaonkar Subject: [PATCH 1/7 cifs] ntlm authentication and signing - Correct response length for ntlmv2 authentication without extended security Date: Mon, 4 Oct 2010 19:56:13 -0500 Message-Id: <1286240173-30716-1-git-send-email-shirishpargaonkar@gmail.com> X-Mailer: git-send-email 1.6.0.2 Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 05 Oct 2010 01:01:03 +0000 (UTC) diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index af18a50..c926e6c 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c @@ -739,9 +739,6 @@ ssetup_ntlmssp_authenticate: pSMB->req_no_secext.CaseInsensitivePasswordLength = 0; /* cpu_to_le16(LM2_SESS_KEY_SIZE); */ - pSMB->req_no_secext.CaseSensitivePasswordLength = - cpu_to_le16(sizeof(struct ntlmv2_resp)); - /* calculate session key */ rc = setup_ntlmv2_rsp(ses, v2_sess_key, nls_cp); if (rc) { @@ -753,6 +750,11 @@ ssetup_ntlmssp_authenticate: sizeof(struct ntlmv2_resp)); bcc_ptr += sizeof(struct ntlmv2_resp); kfree(v2_sess_key); + /* set case sensitive password length after tilen may get + * assigned, tilen is 0 otherwise. + */ + pSMB->req_no_secext.CaseSensitivePasswordLength = + cpu_to_le16(sizeof(struct ntlmv2_resp) + ses->tilen); if (ses->tilen > 0) { memcpy(bcc_ptr, ses->tiblob, ses->tilen); bcc_ptr += ses->tilen; @@ -761,6 +763,7 @@ ssetup_ntlmssp_authenticate: ses->tiblob = NULL; ses->tilen = 0; } + if (ses->capabilities & CAP_UNICODE) { if (iov[0].iov_len % 2) { *bcc_ptr = 0;