{"id":833223,"url":"http://patchwork.ozlabs.org/api/1.2/patches/833223/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-cifs-client/patch/20171102070312.18903-16-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-16-lsahlber@redhat.com>","list_archive_url":null,"date":"2017-11-02T07:03:08","name":"[15/19] cifs: remove rfc1002 header from smb2_oplock_break we get from server","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"39796cce7d56c18eeecab44945ad51bfbc19e9bc","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-16-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/833223/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/833223/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-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.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 3ySGKt52btz9t2V\n\tfor ;\n\tThu, 2 Nov 2017 18:04:34 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1754925AbdKBHEc (ORCPT );\n\tThu, 2 Nov 2017 03:04:32 -0400","from mx1.redhat.com ([209.132.183.28]:56700 \"EHLO mx1.redhat.com\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1755163AbdKBHEa (ORCPT );\n\tThu, 2 Nov 2017 03:04:30 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\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 BE32EC049E31;\n\tThu, 2 Nov 2017 07:04:29 +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 7BAB25C670;\n\tThu, 2 Nov 2017 07:04:26 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com BE32EC049E31","From":"Ronnie Sahlberg ","To":"linux-cifs ","Cc":"Steve French ","Subject":"[PATCH 15/19] cifs: remove rfc1002 header from smb2_oplock_break we\n\tget from server","Date":"Thu, 2 Nov 2017 18:03:08 +1100","Message-Id":"<20171102070312.18903-16-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.16","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.31]);\n\tThu, 02 Nov 2017 07:04:29 +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/smb2misc.c | 2 +-\n fs/cifs/smb2pdu.c | 19 +++++++++++++++----\n fs/cifs/smb2pdu.h | 14 +++++++++++++-\n 3 files changed, 29 insertions(+), 6 deletions(-)","diff":"diff --git a/fs/cifs/smb2misc.c b/fs/cifs/smb2misc.c\nindex 7b08a1446a7f..76d03abaa38c 100644\n--- a/fs/cifs/smb2misc.c\n+++ b/fs/cifs/smb2misc.c\n@@ -578,7 +578,7 @@ smb2_is_valid_lease_break(char *buffer)\n bool\n smb2_is_valid_oplock_break(char *buffer, struct TCP_Server_Info *server)\n {\n-\tstruct smb2_oplock_break *rsp = (struct smb2_oplock_break *)buffer;\n+\tstruct smb2_oplock_break_rsp *rsp = (struct smb2_oplock_break_rsp *)buffer;\n \tstruct list_head *tmp, *tmp1, *tmp2;\n \tstruct cifs_ses *ses;\n \tstruct cifs_tcon *tcon;\ndiff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c\nindex 84e71f6bc9eb..9a1b8e3d8704 100644\n--- a/fs/cifs/smb2pdu.c\n+++ b/fs/cifs/smb2pdu.c\n@@ -3316,11 +3316,17 @@ SMB2_oplock_break(const unsigned int xid, struct cifs_tcon *tcon,\n \t\t __u8 oplock_level)\n {\n \tint rc;\n-\tstruct smb2_oplock_break *req = NULL;\n+\tstruct smb2_oplock_break_req *req = NULL;\n+\tstruct cifs_ses *ses = tcon->ses;\n \tint flags = CIFS_OBREAK_OP;\n+\tunsigned int total_len;\n+\tstruct kvec iov[1];\n+\tstruct kvec rsp_iov;\n+\tint resp_buf_type;\n \n \tcifs_dbg(FYI, \"SMB2_oplock_break\\n\");\n-\trc = small_smb2_init(SMB2_OPLOCK_BREAK, tcon, (void **) &req);\n+\trc = smb2_plain_req_init(SMB2_OPLOCK_BREAK, tcon, (void **) &req,\n+\t\t\t &total_len);\n \tif (rc)\n \t\treturn rc;\n \n@@ -3330,9 +3336,14 @@ SMB2_oplock_break(const unsigned int xid, struct cifs_tcon *tcon,\n \treq->VolatileFid = volatile_fid;\n \treq->PersistentFid = persistent_fid;\n \treq->OplockLevel = oplock_level;\n-\treq->hdr.sync_hdr.CreditRequest = cpu_to_le16(1);\n+\treq->sync_hdr.CreditRequest = cpu_to_le16(1);\n+\n+\tflags |= CIFS_NO_RESP;\n \n-\trc = SendReceiveNoRsp(xid, tcon->ses, (char *) req, flags);\n+\tiov[0].iov_base = (char *)req;\n+\tiov[0].iov_len = total_len;\n+\n+\trc = SendReceive3(xid, ses, iov, 1, &resp_buf_type, flags, &rsp_iov);\n \tcifs_small_buf_release(req);\n \n \tif (rc) {\ndiff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h\nindex 32f0f633b614..7f2a7639ea15 100644\n--- a/fs/cifs/smb2pdu.h\n+++ b/fs/cifs/smb2pdu.h\n@@ -1031,7 +1031,19 @@ struct smb2_set_info_rsp {\n \t__le16 StructureSize; /* Must be 2 */\n } __packed;\n \n-struct smb2_oplock_break {\n+/* oplock break without an rfc1002 header */\n+struct smb2_oplock_break_req {\n+\tstruct smb2_sync_hdr sync_hdr;\n+\t__le16 StructureSize; /* Must be 24 */\n+\t__u8 OplockLevel;\n+\t__u8 Reserved;\n+\t__le32 Reserved2;\n+\t__u64 PersistentFid;\n+\t__u64 VolatileFid;\n+} __packed;\n+\n+/* oplock break with an rfc1002 header */\n+struct smb2_oplock_break_rsp {\n \tstruct smb2_hdr hdr;\n \t__le16 StructureSize; /* Must be 24 */\n \t__u8 OplockLevel;\n","prefixes":["15/19"]}