{"id":833222,"url":"http://patchwork.ozlabs.org/api/1.2/patches/833222/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-cifs-client/patch/20171102070312.18903-19-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-19-lsahlber@redhat.com>","list_archive_url":null,"date":"2017-11-02T07:03:11","name":"[18/19] cifs: remove rfc1002 header from smb2_query_info_req","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"aefe9f38e200bbc1c8afeec8f182f9c11a8f7945","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-19-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/833222/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/833222/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-mx03.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx03.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 3ySGKl00lxz9sRW\n\tfor ;\n\tThu, 2 Nov 2017 18:04:26 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752627AbdKBHEZ (ORCPT );\n\tThu, 2 Nov 2017 03:04:25 -0400","from mx1.redhat.com ([209.132.183.28]:60442 \"EHLO mx1.redhat.com\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1754904AbdKBHEY (ORCPT );\n\tThu, 2 Nov 2017 03:04:24 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\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 F36F77E426;\n\tThu, 2 Nov 2017 07:04:23 +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 DB3475D756;\n\tThu, 2 Nov 2017 07:04:22 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com F36F77E426","From":"Ronnie Sahlberg ","To":"linux-cifs ","Cc":"Steve French ","Subject":"[PATCH 18/19] cifs: remove rfc1002 header from smb2_query_info_req","Date":"Thu, 2 Nov 2017 18:03:11 +1100","Message-Id":"<20171102070312.18903-19-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.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]);\n\tThu, 02 Nov 2017 07:04:24 +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 | 25 +++++++++++++------------\n fs/cifs/smb2pdu.h | 2 +-\n 2 files changed, 14 insertions(+), 13 deletions(-)","diff":"diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c\nindex 0af9efc3d8d2..d2830ab70dff 100644\n--- a/fs/cifs/smb2pdu.c\n+++ b/fs/cifs/smb2pdu.c\n@@ -2186,13 +2186,15 @@ query_info(const unsigned int xid, struct cifs_tcon *tcon,\n \tint resp_buftype;\n \tstruct cifs_ses *ses = tcon->ses;\n \tint flags = 0;\n+\tunsigned int total_len;\n \n \tcifs_dbg(FYI, \"Query Info\\n\");\n \n \tif (!ses || !(ses->server))\n \t\treturn -EIO;\n \n-\trc = small_smb2_init(SMB2_QUERY_INFO, tcon, (void **) &req);\n+\trc = smb2_plain_req_init(SMB2_QUERY_INFO, tcon, (void **) &req,\n+\t\t\t &total_len);\n \tif (rc)\n \t\treturn rc;\n \n@@ -2209,15 +2211,13 @@ query_info(const unsigned int xid, struct cifs_tcon *tcon,\n \t * We do not use the input buffer (do not send extra byte)\n \t */\n \treq->InputBufferOffset = 0;\n-\tinc_rfc1001_len(req, -1);\n \n \treq->OutputBufferLength = cpu_to_le32(output_len);\n \n \tiov[0].iov_base = (char *)req;\n-\t/* 4 for rfc1002 length field */\n-\tiov[0].iov_len = get_rfc1002_length(req) + 4;\n+\tiov[0].iov_len = total_len;\n \n-\trc = SendReceive2(xid, ses, iov, 1, &resp_buftype, flags, &rsp_iov);\n+\trc = SendReceive3(xid, ses, iov, 1, &resp_buftype, flags, &rsp_iov);\n \tcifs_small_buf_release(req);\n \trsp = (struct smb2_query_info_rsp *)rsp_iov.iov_base;\n \n@@ -3370,13 +3370,15 @@ build_qfs_info_req(struct kvec *iov, struct cifs_tcon *tcon, int level,\n {\n \tint rc;\n \tstruct smb2_query_info_req *req;\n+\tunsigned int total_len;\n \n \tcifs_dbg(FYI, \"Query FSInfo level %d\\n\", level);\n \n \tif ((tcon->ses == NULL) || (tcon->ses->server == NULL))\n \t\treturn -EIO;\n \n-\trc = small_smb2_init(SMB2_QUERY_INFO, tcon, (void **) &req);\n+\trc = smb2_plain_req_init(SMB2_QUERY_INFO, tcon, (void **) &req,\n+\t\t\t &total_len);\n \tif (rc)\n \t\treturn rc;\n \n@@ -3384,15 +3386,14 @@ build_qfs_info_req(struct kvec *iov, struct cifs_tcon *tcon, int level,\n \treq->FileInfoClass = level;\n \treq->PersistentFileId = persistent_fid;\n \treq->VolatileFileId = volatile_fid;\n-\t/* 4 for rfc1002 length field and 1 for pad */\n+\t/* 1 for pad */\n \treq->InputBufferOffset =\n-\t\t\tcpu_to_le16(sizeof(struct smb2_query_info_req) - 1 - 4);\n+\t\t\tcpu_to_le16(sizeof(struct smb2_query_info_req) - 1);\n \treq->OutputBufferLength = cpu_to_le32(\n \t\toutbuf_len + sizeof(struct smb2_query_info_rsp) - 1 - 4);\n \n \tiov->iov_base = (char *)req;\n-\t/* 4 for rfc1002 length field */\n-\tiov->iov_len = get_rfc1002_length(req) + 4;\n+\tiov->iov_len = total_len;\n \treturn 0;\n }\n \n@@ -3418,7 +3419,7 @@ SMB2_QFS_info(const unsigned int xid, struct cifs_tcon *tcon,\n \tif (encryption_required(tcon))\n \t\tflags |= CIFS_TRANSFORM_REQ;\n \n-\trc = SendReceive2(xid, ses, &iov, 1, &resp_buftype, flags, &rsp_iov);\n+\trc = SendReceive3(xid, ses, &iov, 1, &resp_buftype, flags, &rsp_iov);\n \tcifs_small_buf_release(iov.iov_base);\n \tif (rc) {\n \t\tcifs_stats_fail_inc(tcon, SMB2_QUERY_INFO_HE);\n@@ -3474,7 +3475,7 @@ SMB2_QFS_attr(const unsigned int xid, struct cifs_tcon *tcon,\n \tif (encryption_required(tcon))\n \t\tflags |= CIFS_TRANSFORM_REQ;\n \n-\trc = SendReceive2(xid, ses, &iov, 1, &resp_buftype, flags, &rsp_iov);\n+\trc = SendReceive3(xid, ses, &iov, 1, &resp_buftype, flags, &rsp_iov);\n \tcifs_small_buf_release(iov.iov_base);\n \tif (rc) {\n \t\tcifs_stats_fail_inc(tcon, SMB2_QUERY_INFO_HE);\ndiff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h\nindex 630a5c064f0c..19d34881815f 100644\n--- a/fs/cifs/smb2pdu.h\n+++ b/fs/cifs/smb2pdu.h\n@@ -989,7 +989,7 @@ struct smb2_query_directory_rsp {\n #define SL_INDEX_SPECIFIED\t0x00000004\n \n struct smb2_query_info_req {\n-\tstruct smb2_hdr hdr;\n+\tstruct smb2_sync_hdr sync_hdr;\n \t__le16 StructureSize; /* Must be 41 */\n \t__u8 InfoType;\n \t__u8 FileInfoClass;\n","prefixes":["18/19"]}