{"id":833226,"url":"http://patchwork.ozlabs.org/api/1.2/patches/833226/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-cifs-client/patch/20171102070312.18903-10-lsahlber@redhat.com/","project":{"id":12,"url":"http://patchwork.ozlabs.org/api/1.2/projects/12/?format=json","name":"Linux CIFS Client","link_name":"linux-cifs-client","list_id":"linux-cifs.vger.kernel.org","list_email":"linux-cifs@vger.kernel.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20171102070312.18903-10-lsahlber@redhat.com>","list_archive_url":null,"date":"2017-11-02T07:03:02","name":"[09/19] cifs: remove rfc1002 header from smb2_tree_connect_req","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"83027efc2398328b4532d0678a36f6369ce419b5","submitter":{"id":72324,"url":"http://patchwork.ozlabs.org/api/1.2/people/72324/?format=json","name":"Ronnie Sahlberg","email":"lsahlber@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-cifs-client/patch/20171102070312.18903-10-lsahlber@redhat.com/mbox/","series":[{"id":11445,"url":"http://patchwork.ozlabs.org/api/1.2/series/11445/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-cifs-client/list/?series=11445","date":"2017-11-02T07:03:12","name":"cifs: remove rfc1002 header from all smb2 requests","version":1,"mbox":"http://patchwork.ozlabs.org/series/11445/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/833226/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/833226/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=linux-cifs-owner@vger.kernel.org;\n\treceiver=)","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=lsahlber@redhat.com"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3ySGL95bbfz9sRW\n\tfor ;\n\tThu, 2 Nov 2017 18:04:49 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1755098AbdKBHEs (ORCPT );\n\tThu, 2 Nov 2017 03:04:48 -0400","from mx1.redhat.com ([209.132.183.28]:52486 \"EHLO mx1.redhat.com\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1755077AbdKBHEr (ORCPT );\n\tThu, 2 Nov 2017 03:04:47 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 5D662356C2;\n\tThu, 2 Nov 2017 07:04:47 +0000 (UTC)","from test1190.test.redhat.com (vpn2-54-17.bne.redhat.com\n\t[10.64.54.17])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id A631F600C0;\n\tThu, 2 Nov 2017 07:04:44 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 5D662356C2","From":"Ronnie Sahlberg ","To":"linux-cifs ","Cc":"Steve French ","Subject":"[PATCH 09/19] cifs: remove rfc1002 header from smb2_tree_connect_req","Date":"Thu, 2 Nov 2017 18:03:02 +1100","Message-Id":"<20171102070312.18903-10-lsahlber@redhat.com>","In-Reply-To":"<20171102070312.18903-1-lsahlber@redhat.com>","References":"<20171102070312.18903-1-lsahlber@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]);\n\tThu, 02 Nov 2017 07:04:47 +0000 (UTC)","Sender":"linux-cifs-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"linux-cifs@vger.kernel.org"},"content":"Signed-off-by: Ronnie Sahlberg \n---\n fs/cifs/smb2pdu.c | 18 +++++++++---------\n fs/cifs/smb2pdu.h | 2 +-\n 2 files changed, 10 insertions(+), 10 deletions(-)","diff":"diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c\nindex bfd805da6874..305e4be511ba 100644\n--- a/fs/cifs/smb2pdu.c\n+++ b/fs/cifs/smb2pdu.c\n@@ -1269,6 +1269,7 @@ SMB2_tcon(const unsigned int xid, struct cifs_ses *ses, const char *tree,\n \tint unc_path_len;\n \t__le16 *unc_path = NULL;\n \tint flags = 0;\n+\tunsigned int total_len;\n \n \tcifs_dbg(FYI, \"TCON\\n\");\n \n@@ -1290,7 +1291,8 @@ SMB2_tcon(const unsigned int xid, struct cifs_ses *ses, const char *tree,\n \tif (tcon)\n \t\ttcon->tid = 0;\n \n-\trc = small_smb2_init(SMB2_TREE_CONNECT, tcon, (void **) &req);\n+\trc = smb2_plain_req_init(SMB2_TREE_CONNECT, tcon, (void **) &req,\n+\t\t\t &total_len);\n \tif (rc) {\n \t\tkfree(unc_path);\n \t\treturn rc;\n@@ -1301,26 +1303,24 @@ SMB2_tcon(const unsigned int xid, struct cifs_ses *ses, const char *tree,\n \t\t\tflags |= CIFS_TRANSFORM_REQ;\n \n \t\t/* since no tcon, smb2_init can not do this, so do here */\n-\t\treq->hdr.sync_hdr.SessionId = ses->Suid;\n+\t\treq->sync_hdr.SessionId = ses->Suid;\n \t\tif (ses->server->sign)\n-\t\t\treq->hdr.sync_hdr.Flags |= SMB2_FLAGS_SIGNED;\n+\t\t\treq->sync_hdr.Flags |= SMB2_FLAGS_SIGNED;\n \t} else if (encryption_required(tcon))\n \t\tflags |= CIFS_TRANSFORM_REQ;\n \n \tiov[0].iov_base = (char *)req;\n-\t/* 4 for rfc1002 length field and 1 for pad */\n-\tiov[0].iov_len = get_rfc1002_length(req) + 4 - 1;\n+\t/* 1 for pad */\n+\tiov[0].iov_len = total_len - 1;\n \n \t/* Testing shows that buffer offset must be at location of Buffer[0] */\n \treq->PathOffset = cpu_to_le16(sizeof(struct smb2_tree_connect_req)\n-\t\t\t- 1 /* pad */ - 4 /* do not count rfc1001 len field */);\n+\t\t\t- 1 /* pad */);\n \treq->PathLength = cpu_to_le16(unc_path_len - 2);\n \tiov[1].iov_base = unc_path;\n \tiov[1].iov_len = unc_path_len;\n \n-\tinc_rfc1001_len(req, unc_path_len - 1 /* pad */);\n-\n-\trc = SendReceive2(xid, ses, iov, 2, &resp_buftype, flags, &rsp_iov);\n+\trc = SendReceive3(xid, ses, iov, 2, &resp_buftype, flags, &rsp_iov);\n \tcifs_small_buf_release(req);\n \trsp = (struct smb2_tree_connect_rsp *)rsp_iov.iov_base;\n \ndiff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h\nindex e7acfa5e3fa6..4f80b95d02ae 100644\n--- a/fs/cifs/smb2pdu.h\n+++ b/fs/cifs/smb2pdu.h\n@@ -323,7 +323,7 @@ struct smb2_logoff_rsp {\n #define SMB2_SHAREFLAG_CLUSTER_RECONNECT\t0x0001\n \n struct smb2_tree_connect_req {\n-\tstruct smb2_hdr hdr;\n+\tstruct smb2_sync_hdr sync_hdr;\n \t__le16 StructureSize;\t/* Must be 9 */\n \t__le16 Reserved; /* Flags in SMB3.1.1 */\n \t__le16 PathOffset;\n","prefixes":["09/19"]}