Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/833230/?format=api
{ "id": 833230, "url": "http://patchwork.ozlabs.org/api/1.2/patches/833230/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linux-cifs-client/patch/20171102070312.18903-9-lsahlber@redhat.com/", "project": { "id": 12, "url": "http://patchwork.ozlabs.org/api/1.2/projects/12/?format=api", "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-9-lsahlber@redhat.com>", "list_archive_url": null, "date": "2017-11-02T07:03:01", "name": "[08/19] cifs: remove rfc1002 header from smb2_sess_setup_req", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "32a3862bcc7c604f58b10d2a74b1b1f09424ad3e", "submitter": { "id": 72324, "url": "http://patchwork.ozlabs.org/api/1.2/people/72324/?format=api", "name": "Ronnie Sahlberg", "email": "lsahlber@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linux-cifs-client/patch/20171102070312.18903-9-lsahlber@redhat.com/mbox/", "series": [ { "id": 11445, "url": "http://patchwork.ozlabs.org/api/1.2/series/11445/?format=api", "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/833230/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/833230/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<linux-cifs-owner@vger.kernel.org>", "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=<UNKNOWN>)", "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 3ySGLT0Hjcz9sRW\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 2 Nov 2017 18:05:05 +1100 (AEDT)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752547AbdKBHED (ORCPT <rfc822;incoming@patchwork.ozlabs.org>);\n\tThu, 2 Nov 2017 03:04:03 -0400", "from mx1.redhat.com ([209.132.183.28]:9408 \"EHLO mx1.redhat.com\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1750907AbdKBHEA (ORCPT <rfc822;linux-cifs@vger.kernel.org>);\n\tThu, 2 Nov 2017 03:04:00 -0400", "from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\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 9EC5AC047B6B;\n\tThu, 2 Nov 2017 07:04:00 +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 2EB765D9CA;\n\tThu, 2 Nov 2017 07:03:58 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com 9EC5AC047B6B", "From": "Ronnie Sahlberg <lsahlber@redhat.com>", "To": "linux-cifs <linux-cifs@vger.kernel.org>", "Cc": "Steve French <smfrench@gmail.com>", "Subject": "[PATCH 08/19] cifs: remove rfc1002 header from smb2_sess_setup_req", "Date": "Thu, 2 Nov 2017 18:03:01 +1100", "Message-Id": "<20171102070312.18903-9-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.14", "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:00 +0000 (UTC)", "Sender": "linux-cifs-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<linux-cifs.vger.kernel.org>", "X-Mailing-List": "linux-cifs@vger.kernel.org" }, "content": "Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>\n---\n fs/cifs/smb2pdu.c | 27 +++++++++++++--------------\n fs/cifs/smb2pdu.h | 2 +-\n 2 files changed, 14 insertions(+), 15 deletions(-)", "diff": "diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c\nindex 908be5899502..bfd805da6874 100644\n--- a/fs/cifs/smb2pdu.c\n+++ b/fs/cifs/smb2pdu.c\n@@ -802,20 +802,22 @@ SMB2_sess_alloc_buffer(struct SMB2_sess_data *sess_data)\n \tstruct cifs_ses *ses = sess_data->ses;\n \tstruct smb2_sess_setup_req *req;\n \tstruct TCP_Server_Info *server = ses->server;\n+\tunsigned int total_len;\n \n-\trc = small_smb2_init(SMB2_SESSION_SETUP, NULL, (void **) &req);\n+\trc = smb2_plain_req_init(SMB2_SESSION_SETUP, NULL, (void **) &req,\n+\t\t\t &total_len);\n \tif (rc)\n \t\treturn rc;\n \n \t/* First session, not a reauthenticate */\n-\treq->hdr.sync_hdr.SessionId = 0;\n+\treq->sync_hdr.SessionId = 0;\n \n \t/* if reconnect, we need to send previous sess id, otherwise it is 0 */\n \treq->PreviousSessionId = sess_data->previous_session;\n \n \treq->Flags = 0; /* MBZ */\n \t/* to enable echos and oplocks */\n-\treq->hdr.sync_hdr.CreditRequest = cpu_to_le16(3);\n+\treq->sync_hdr.CreditRequest = cpu_to_le16(3);\n \n \t/* only one of SMB2 signing flags may be set in SMB2 request */\n \tif (server->sign)\n@@ -829,8 +831,8 @@ SMB2_sess_alloc_buffer(struct SMB2_sess_data *sess_data)\n \treq->Channel = 0; /* MBZ */\n \n \tsess_data->iov[0].iov_base = (char *)req;\n-\t/* 4 for rfc1002 length field and 1 for pad */\n-\tsess_data->iov[0].iov_len = get_rfc1002_length(req) + 4 - 1;\n+\t/* 1 for pad */\n+\tsess_data->iov[0].iov_len = total_len - 1;\n \t/*\n \t * This variable will be used to clear the buffer\n \t * allocated above in case of any error in the calling function.\n@@ -856,18 +858,15 @@ SMB2_sess_sendreceive(struct SMB2_sess_data *sess_data)\n \n \t/* Testing shows that buffer offset must be at location of Buffer[0] */\n \treq->SecurityBufferOffset =\n-\t\tcpu_to_le16(sizeof(struct smb2_sess_setup_req) -\n-\t\t\t1 /* pad */ - 4 /* rfc1001 len */);\n+\t\tcpu_to_le16(sizeof(struct smb2_sess_setup_req) - 1 /* pad */);\n \treq->SecurityBufferLength = cpu_to_le16(sess_data->iov[1].iov_len);\n \n-\tinc_rfc1001_len(req, sess_data->iov[1].iov_len - 1 /* pad */);\n-\n \t/* BB add code to build os and lm fields */\n \n-\trc = SendReceive2(sess_data->xid, sess_data->ses,\n-\t\t\t\tsess_data->iov, 2,\n-\t\t\t\t&sess_data->buf0_type,\n-\t\t\t\tCIFS_LOG_ERROR | CIFS_NEG_OP, &rsp_iov);\n+\trc = SendReceive3(sess_data->xid, sess_data->ses,\n+\t\t\t sess_data->iov, 2,\n+\t\t\t &sess_data->buf0_type,\n+\t\t\t CIFS_LOG_ERROR | CIFS_NEG_OP, &rsp_iov);\n \tcifs_small_buf_release(sess_data->iov[0].iov_base);\n \tmemcpy(&sess_data->iov[0], &rsp_iov, sizeof(struct kvec));\n \n@@ -1088,7 +1087,7 @@ SMB2_sess_auth_rawntlmssp_authenticate(struct SMB2_sess_data *sess_data)\n \t\tgoto out;\n \n \treq = (struct smb2_sess_setup_req *) sess_data->iov[0].iov_base;\n-\treq->hdr.sync_hdr.SessionId = ses->Suid;\n+\treq->sync_hdr.SessionId = ses->Suid;\n \n \trc = build_ntlmssp_auth_blob(&ntlmssp_blob, &blob_length, ses,\n \t\t\t\t\tsess_data->nls_cp);\ndiff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h\nindex b22bf8c6753e..e7acfa5e3fa6 100644\n--- a/fs/cifs/smb2pdu.h\n+++ b/fs/cifs/smb2pdu.h\n@@ -282,7 +282,7 @@ struct smb2_negotiate_rsp {\n #define SMB2_SESSION_REQ_FLAG_ENCRYPT_DATA\t0x04\n \n struct smb2_sess_setup_req {\n-\tstruct smb2_hdr hdr;\n+\tstruct smb2_sync_hdr sync_hdr;\n \t__le16 StructureSize; /* Must be 25 */\n \t__u8 Flags;\n \t__u8 SecurityMode;\n", "prefixes": [ "08/19" ] }