From patchwork Tue May 13 20:50:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve French X-Patchwork-Id: 4170521 Return-Path: X-Original-To: patchwork-cifs-client@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6A5B9BFF02 for ; Tue, 13 May 2014 20:51:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AB53C20166 for ; Tue, 13 May 2014 20:51:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DD50020270 for ; Tue, 13 May 2014 20:51:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755107AbaEMUvN (ORCPT ); Tue, 13 May 2014 16:51:13 -0400 Received: from mail-qc0-f173.google.com ([209.85.216.173]:34773 "EHLO mail-qc0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754994AbaEMUvG (ORCPT ); Tue, 13 May 2014 16:51:06 -0400 Received: by mail-qc0-f173.google.com with SMTP id i8so1263430qcq.4 for ; Tue, 13 May 2014 13:51:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:from:date:message-id:subject:to:content-type; bh=MRuEpbv9Kcrik8Rt7RNn++vcfzVb9/3Tw2RrjMRfzvs=; b=z8gatRhebX4tslcWadrjNkCtQ/k0yEnrLlQmQFTN20s2xyEXtmdLOPSP5SJ8DSODjZ KZHfyxUbWO6M+Oo5H2cREtKB3PAA9HBr3P3SOvzYcVZCW9uMP1bRQWpyVuMY1q4ZqhQQ FedIrKwL20FHHWWRIDlkLQqbwAAOHqNL2jtHc0t7LPKIvCzsXhZan9MGDBcinf7iVR50 JADxkJF5/HBE3IJ9xkV9Yd66ZVXPd1U/1iB9Uig6XCM7h9YFfIt6vqey7sohb9oeeQNA i9iH9z9e0AuWnvTCP/megCMz+q8xz1G2Ns/I2hrUzA/C9rSAigehaE2vmP4YqkVoB2d+ XmAw== X-Received: by 10.140.24.98 with SMTP id 89mr23320333qgq.33.1400014265750; Tue, 13 May 2014 13:51:05 -0700 (PDT) MIME-Version: 1.0 Received: by 10.140.96.72 with HTTP; Tue, 13 May 2014 13:50:45 -0700 (PDT) From: Steve French Date: Tue, 13 May 2014 22:50:45 +0200 Message-ID: Subject: [PATCH][CIFS] Do not send non-zero ClientGUID on SMB2.02 dialect negotiate protocol request To: "linux-cifs@vger.kernel.org" , Sachin Prabhu Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From ac9334f68ece14fa3f6ee23a5966702fdadbe182 Mon Sep 17 00:00:00 2001 From: Steve French Date: Tue, 13 May 2014 13:37:45 -0700 Subject: [PATCH] [CIFS] Do not send ClientGUID on SMB2.02 dialect ClientGUID must be zero for SMB2.02 dialect. See section 2.2.3 of MS-SMB2. For SMB2.1 and later it must be non-zero. Signed-off-by: Steve French CC: Sachin Prabhu --- fs/cifs/smb2pdu.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) /* 4 for rfc1002 length field */ diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index dc44610..e8b2550 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -375,7 +375,12 @@ SMB2_negotiate(const unsigned int xid, struct cifs_ses *ses) req->Capabilities = cpu_to_le32(ses->server->vals->req_capabilities); - memcpy(req->ClientGUID, server->client_guid, SMB2_CLIENT_GUID_SIZE); + /* ClientGUID must be zero for SMB2.02 dialect */ + if (ses->server->vals->protocol_id == SMB20_PROT_ID) + memset(req->ClientGUID, 0, SMB2_CLIENT_GUID_SIZE); + else + memcpy(req->ClientGUID, server->client_guid, + SMB2_CLIENT_GUID_SIZE); iov[0].iov_base = (char *)req;