{"id":833217,"url":"http://patchwork.ozlabs.org/api/1.2/patches/833217/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-cifs-client/patch/20171102070312.18903-8-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-8-lsahlber@redhat.com>","list_archive_url":null,"date":"2017-11-02T07:03:00","name":"[07/19] cifs: remove rfc1002 header from smb2_echo_req","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"fd3053f33aae7ae95090ec46123a642191428331","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-8-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/833217/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/833217/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-mx01.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx01.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 3ySGJv4r4sz9sRW\n\tfor ;\n\tThu, 2 Nov 2017 18:03:43 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1754844AbdKBHDl (ORCPT );\n\tThu, 2 Nov 2017 03:03:41 -0400","from mx1.redhat.com ([209.132.183.28]:39332 \"EHLO mx1.redhat.com\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1754803AbdKBHDk (ORCPT );\n\tThu, 2 Nov 2017 03:03:40 -0400","from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\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 62C3681E04;\n\tThu, 2 Nov 2017 07:03:40 +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 BA1A760602;\n\tThu, 2 Nov 2017 07:03:37 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 62C3681E04","From":"Ronnie Sahlberg ","To":"linux-cifs ","Cc":"Steve French ","Subject":"[PATCH 07/19] cifs: remove rfc1002 header from smb2_echo_req","Date":"Thu, 2 Nov 2017 18:03:00 +1100","Message-Id":"<20171102070312.18903-8-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.13","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.25]);\n\tThu, 02 Nov 2017 07:03:40 +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 | 14 ++++++++------\n fs/cifs/smb2pdu.h | 2 +-\n 2 files changed, 9 insertions(+), 7 deletions(-)","diff":"diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c\nindex 91d78bed6940..908be5899502 100644\n--- a/fs/cifs/smb2pdu.c\n+++ b/fs/cifs/smb2pdu.c\n@@ -2390,6 +2390,8 @@ SMB2_echo(struct TCP_Server_Info *server)\n \tstruct kvec iov[2];\n \tstruct smb_rqst rqst = { .rq_iov = iov,\n \t\t\t\t .rq_nvec = 2 };\n+\tunsigned int total_len;\n+\t__be32 rfc1002_marker;\n \n \tcifs_dbg(FYI, \"In echo request\\n\");\n \n@@ -2399,17 +2401,17 @@ SMB2_echo(struct TCP_Server_Info *server)\n \t\treturn rc;\n \t}\n \n-\trc = small_smb2_init(SMB2_ECHO, NULL, (void **)&req);\n+\trc = smb2_plain_req_init(SMB2_ECHO, NULL, (void **)&req, &total_len);\n \tif (rc)\n \t\treturn rc;\n \n-\treq->hdr.sync_hdr.CreditRequest = cpu_to_le16(1);\n+\treq->sync_hdr.CreditRequest = cpu_to_le16(1);\n \n-\t/* 4 for rfc1002 length field */\n \tiov[0].iov_len = 4;\n-\tiov[0].iov_base = (char *)req;\n-\tiov[1].iov_len = get_rfc1002_length(req);\n-\tiov[1].iov_base = (char *)req + 4;\n+\trfc1002_marker = cpu_to_be32(total_len);\n+\tiov[0].iov_base = &rfc1002_marker;\n+\tiov[1].iov_len = total_len;\n+\tiov[1].iov_base = (char *)req;\n \n \trc = cifs_call_async(server, &rqst, NULL, smb2_echo_callback, NULL,\n \t\t\t server, CIFS_ECHO_OP);\ndiff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h\nindex 2c743d338a11..b22bf8c6753e 100644\n--- a/fs/cifs/smb2pdu.h\n+++ b/fs/cifs/smb2pdu.h\n@@ -924,7 +924,7 @@ struct smb2_lock_rsp {\n } __packed;\n \n struct smb2_echo_req {\n-\tstruct smb2_hdr hdr;\n+\tstruct smb2_sync_hdr sync_hdr;\n \t__le16 StructureSize;\t/* Must be 4 */\n \t__u16 Reserved;\n } __packed;\n","prefixes":["07/19"]}