]> Pileus Git - ~andy/linux/blobdiff - fs/cifs/smb2pdu.c
Merge tag 'for_3.7-fixes-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...
[~andy/linux] / fs / cifs / smb2pdu.c
index 74a8381400b15516ed43f693c15f9700c3a7a656..cf33622cdac841c7108d76043cf70ca7fab252e7 100644 (file)
@@ -1,7 +1,7 @@
 /*
  *   fs/cifs/smb2pdu.c
  *
- *   Copyright (C) International Business Machines  Corp., 2009, 2011
+ *   Copyright (C) International Business Machines  Corp., 2009, 2012
  *                 Etersoft, 2012
  *   Author(s): Steve French (sfrench@us.ibm.com)
  *              Pavel Shilovsky (pshilovsky@samba.org) 2012
@@ -45,6 +45,7 @@
 #include "ntlmssp.h"
 #include "smb2status.h"
 #include "smb2glob.h"
+#include "cifspdu.h"
 
 /*
  *  The following table defines the expected "StructureSize" of SMB2 requests
@@ -303,24 +304,6 @@ free_rsp_buf(int resp_buftype, void *rsp)
                cifs_buf_release(rsp);
 }
 
-#define SMB2_NUM_PROT 1
-
-#define SMB2_PROT   0
-#define SMB21_PROT  1
-#define BAD_PROT 0xFFFF
-
-#define SMB2_PROT_ID  0x0202
-#define SMB21_PROT_ID 0x0210
-#define BAD_PROT_ID   0xFFFF
-
-static struct {
-       int index;
-       __le16 name;
-} smb2protocols[] = {
-       {SMB2_PROT,  cpu_to_le16(SMB2_PROT_ID)},
-       {SMB21_PROT, cpu_to_le16(SMB21_PROT_ID)},
-       {BAD_PROT,   cpu_to_le16(BAD_PROT_ID)}
-};
 
 /*
  *
@@ -347,7 +330,6 @@ SMB2_negotiate(const unsigned int xid, struct cifs_ses *ses)
        int resp_buftype;
        struct TCP_Server_Info *server;
        unsigned int sec_flags;
-       u16 i;
        u16 temp = 0;
        int blob_offset, blob_length;
        char *security_blob;
@@ -376,11 +358,10 @@ SMB2_negotiate(const unsigned int xid, struct cifs_ses *ses)
 
        req->hdr.SessionId = 0;
 
-       for (i = 0; i < SMB2_NUM_PROT; i++)
-               req->Dialects[i] = smb2protocols[i].name;
+       req->Dialects[0] = cpu_to_le16(ses->server->vals->protocol_id);
 
-       req->DialectCount = cpu_to_le16(i);
-       inc_rfc1001_len(req, i * 2);
+       req->DialectCount = cpu_to_le16(1); /* One vers= at a time for now */
+       inc_rfc1001_len(req, 2);
 
        /* only one of SMB2 signing flags may be set in SMB2 request */
        if ((sec_flags & CIFSSEC_MUST_SIGN) == CIFSSEC_MUST_SIGN)
@@ -390,7 +371,9 @@ SMB2_negotiate(const unsigned int xid, struct cifs_ses *ses)
 
        req->SecurityMode = cpu_to_le16(temp);
 
-       req->Capabilities = cpu_to_le32(SMB2_GLOBAL_CAP_DFS);
+       req->Capabilities = cpu_to_le32(ses->server->vals->req_capabilities);
+
+       memcpy(req->ClientGUID, cifs_client_guid, SMB2_CLIENT_GUID_SIZE);
 
        iov[0].iov_base = (char *)req;
        /* 4 for rfc1002 length field */
@@ -406,17 +389,16 @@ SMB2_negotiate(const unsigned int xid, struct cifs_ses *ses)
        if (rc != 0)
                goto neg_exit;
 
-       if (rsp == NULL) {
-               rc = -EIO;
-               goto neg_exit;
-       }
-
        cFYI(1, "mode 0x%x", rsp->SecurityMode);
 
-       if (rsp->DialectRevision == smb2protocols[SMB21_PROT].name)
+       /* BB we may eventually want to match the negotiated vs. requested
+          dialect, even though we are only requesting one at a time */
+       if (rsp->DialectRevision == cpu_to_le16(SMB20_PROT_ID))
+               cFYI(1, "negotiated smb2.0 dialect");
+       else if (rsp->DialectRevision == cpu_to_le16(SMB21_PROT_ID))
                cFYI(1, "negotiated smb2.1 dialect");
-       else if (rsp->DialectRevision == smb2protocols[SMB2_PROT].name)
-               cFYI(1, "negotiated smb2 dialect");
+       else if (rsp->DialectRevision == cpu_to_le16(SMB30_PROT_ID))
+               cFYI(1, "negotiated smb3.0 dialect");
        else {
                cERROR(1, "Illegal dialect returned by server %d",
                           le16_to_cpu(rsp->DialectRevision));
@@ -634,13 +616,14 @@ ssetup_ntlmssp_authenticate:
 
        kfree(security_blob);
        rsp = (struct smb2_sess_setup_rsp *)iov[0].iov_base;
-       if (rsp->hdr.Status == STATUS_MORE_PROCESSING_REQUIRED) {
+       if (resp_buftype != CIFS_NO_BUFFER &&
+           rsp->hdr.Status == STATUS_MORE_PROCESSING_REQUIRED) {
                if (phase != NtLmNegotiate) {
                        cERROR(1, "Unexpected more processing error");
                        goto ssetup_exit;
                }
                if (offsetof(struct smb2_sess_setup_rsp, Buffer) - 4 !=
-                       le16_to_cpu(rsp->SecurityBufferOffset)) {
+                               le16_to_cpu(rsp->SecurityBufferOffset)) {
                        cERROR(1, "Invalid security buffer offset %d",
                                  le16_to_cpu(rsp->SecurityBufferOffset));
                        rc = -EIO;
@@ -666,11 +649,6 @@ ssetup_ntlmssp_authenticate:
        if (rc != 0)
                goto ssetup_exit;
 
-       if (rsp == NULL) {
-               rc = -EIO;
-               goto ssetup_exit;
-       }
-
        ses->session_flags = le16_to_cpu(rsp->SessionFlags);
 ssetup_exit:
        free_rsp_buf(resp_buftype, rsp);
@@ -790,11 +768,6 @@ SMB2_tcon(const unsigned int xid, struct cifs_ses *ses, const char *tree,
                goto tcon_error_exit;
        }
 
-       if (rsp == NULL) {
-               rc = -EIO;
-               goto tcon_exit;
-       }
-
        if (tcon == NULL) {
                ses->ipc_tid = rsp->hdr.TreeId;
                goto tcon_exit;
@@ -867,19 +840,87 @@ SMB2_tdis(const unsigned int xid, struct cifs_tcon *tcon)
        return rc;
 }
 
+static struct create_lease *
+create_lease_buf(u8 *lease_key, u8 oplock)
+{
+       struct create_lease *buf;
+
+       buf = kmalloc(sizeof(struct create_lease), GFP_KERNEL);
+       if (!buf)
+               return NULL;
+
+       memset(buf, 0, sizeof(struct create_lease));
+
+       buf->lcontext.LeaseKeyLow = cpu_to_le64(*((u64 *)lease_key));
+       buf->lcontext.LeaseKeyHigh = cpu_to_le64(*((u64 *)(lease_key + 8)));
+       if (oplock == SMB2_OPLOCK_LEVEL_EXCLUSIVE)
+               buf->lcontext.LeaseState = SMB2_LEASE_WRITE_CACHING |
+                                          SMB2_LEASE_READ_CACHING;
+       else if (oplock == SMB2_OPLOCK_LEVEL_II)
+               buf->lcontext.LeaseState = SMB2_LEASE_READ_CACHING;
+       else if (oplock == SMB2_OPLOCK_LEVEL_BATCH)
+               buf->lcontext.LeaseState = SMB2_LEASE_HANDLE_CACHING |
+                                          SMB2_LEASE_READ_CACHING |
+                                          SMB2_LEASE_WRITE_CACHING;
+
+       buf->ccontext.DataOffset = cpu_to_le16(offsetof
+                                       (struct create_lease, lcontext));
+       buf->ccontext.DataLength = cpu_to_le32(sizeof(struct lease_context));
+       buf->ccontext.NameOffset = cpu_to_le16(offsetof
+                               (struct create_lease, Name));
+       buf->ccontext.NameLength = cpu_to_le16(4);
+       buf->Name[0] = 'R';
+       buf->Name[1] = 'q';
+       buf->Name[2] = 'L';
+       buf->Name[3] = 's';
+       return buf;
+}
+
+static __u8
+parse_lease_state(struct smb2_create_rsp *rsp)
+{
+       char *data_offset;
+       struct create_lease *lc;
+       bool found = false;
+
+       data_offset = (char *)rsp;
+       data_offset += 4 + le32_to_cpu(rsp->CreateContextsOffset);
+       lc = (struct create_lease *)data_offset;
+       do {
+               char *name = le16_to_cpu(lc->ccontext.NameOffset) + (char *)lc;
+               if (le16_to_cpu(lc->ccontext.NameLength) != 4 ||
+                   strncmp(name, "RqLs", 4)) {
+                       lc = (struct create_lease *)((char *)lc
+                                       + le32_to_cpu(lc->ccontext.Next));
+                       continue;
+               }
+               if (lc->lcontext.LeaseFlags & SMB2_LEASE_FLAG_BREAK_IN_PROGRESS)
+                       return SMB2_OPLOCK_LEVEL_NOCHANGE;
+               found = true;
+               break;
+       } while (le32_to_cpu(lc->ccontext.Next) != 0);
+
+       if (!found)
+               return 0;
+
+       return smb2_map_lease_to_oplock(lc->lcontext.LeaseState);
+}
+
 int
 SMB2_open(const unsigned int xid, struct cifs_tcon *tcon, __le16 *path,
          u64 *persistent_fid, u64 *volatile_fid, __u32 desired_access,
          __u32 create_disposition, __u32 file_attributes, __u32 create_options,
-         struct smb2_file_all_info *buf)
+         __u8 *oplock, struct smb2_file_all_info *buf)
 {
        struct smb2_create_req *req;
        struct smb2_create_rsp *rsp;
        struct TCP_Server_Info *server;
        struct cifs_ses *ses = tcon->ses;
-       struct kvec iov[2];
+       struct kvec iov[3];
        int resp_buftype;
        int uni_path_len;
+       __le16 *copy_path = NULL;
+       int copy_size;
        int rc = 0;
        int num_iovecs = 2;
 
@@ -894,10 +935,6 @@ SMB2_open(const unsigned int xid, struct cifs_tcon *tcon, __le16 *path,
        if (rc)
                return rc;
 
-       /* if (server->oplocks)
-               req->RequestedOplockLevel = SMB2_OPLOCK_LEVEL_BATCH;
-       else */
-               req->RequestedOplockLevel = SMB2_OPLOCK_LEVEL_NONE;
        req->ImpersonationLevel = IL_IMPERSONATION;
        req->DesiredAccess = cpu_to_le32(desired_access);
        /* File attributes ignored on open (used in create though) */
@@ -907,7 +944,7 @@ SMB2_open(const unsigned int xid, struct cifs_tcon *tcon, __le16 *path,
        req->CreateOptions = cpu_to_le32(create_options);
        uni_path_len = (2 * UniStrnlen((wchar_t *)path, PATH_MAX)) + 2;
        req->NameOffset = cpu_to_le16(sizeof(struct smb2_create_req)
-                       - 1 /* pad */ - 4 /* do not count rfc1001 len field */);
+                       - 8 /* pad */ - 4 /* do not count rfc1001 len field */);
 
        iov[0].iov_base = (char *)req;
        /* 4 for rfc1002 length field */
@@ -918,6 +955,20 @@ SMB2_open(const unsigned int xid, struct cifs_tcon *tcon, __le16 *path,
                req->NameLength = cpu_to_le16(uni_path_len - 2);
                /* -1 since last byte is buf[0] which is sent below (path) */
                iov[0].iov_len--;
+               if (uni_path_len % 8 != 0) {
+                       copy_size = uni_path_len / 8 * 8;
+                       if (copy_size < uni_path_len)
+                               copy_size += 8;
+
+                       copy_path = kzalloc(copy_size, GFP_KERNEL);
+                       if (!copy_path)
+                               return -ENOMEM;
+                       memcpy((char *)copy_path, (const char *)path,
+                               uni_path_len);
+                       uni_path_len = copy_size;
+                       path = copy_path;
+               }
+
                iov[1].iov_len = uni_path_len;
                iov[1].iov_base = path;
                /*
@@ -926,10 +977,37 @@ SMB2_open(const unsigned int xid, struct cifs_tcon *tcon, __le16 *path,
                 */
                inc_rfc1001_len(req, uni_path_len - 1);
        } else {
+               iov[0].iov_len += 7;
+               req->hdr.smb2_buf_length = cpu_to_be32(be32_to_cpu(
+                               req->hdr.smb2_buf_length) + 8 - 1);
                num_iovecs = 1;
                req->NameLength = 0;
        }
 
+       if (!server->oplocks)
+               *oplock = SMB2_OPLOCK_LEVEL_NONE;
+
+       if (!(tcon->ses->server->capabilities & SMB2_GLOBAL_CAP_LEASING) ||
+           *oplock == SMB2_OPLOCK_LEVEL_NONE)
+               req->RequestedOplockLevel = *oplock;
+       else {
+               iov[num_iovecs].iov_base = create_lease_buf(oplock+1, *oplock);
+               if (iov[num_iovecs].iov_base == NULL) {
+                       cifs_small_buf_release(req);
+                       kfree(copy_path);
+                       return -ENOMEM;
+               }
+               iov[num_iovecs].iov_len = sizeof(struct create_lease);
+               req->RequestedOplockLevel = SMB2_OPLOCK_LEVEL_LEASE;
+               req->CreateContextsOffset = cpu_to_le32(
+                       sizeof(struct smb2_create_req) - 4 - 8 +
+                       iov[num_iovecs-1].iov_len);
+               req->CreateContextsLength = cpu_to_le32(
+                       sizeof(struct create_lease));
+               inc_rfc1001_len(&req->hdr, sizeof(struct create_lease));
+               num_iovecs++;
+       }
+
        rc = SendReceive2(xid, ses, iov, num_iovecs, &resp_buftype, 0);
        rsp = (struct smb2_create_rsp *)iov[0].iov_base;
 
@@ -938,10 +1016,6 @@ SMB2_open(const unsigned int xid, struct cifs_tcon *tcon, __le16 *path,
                goto creat_exit;
        }
 
-       if (rsp == NULL) {
-               rc = -EIO;
-               goto creat_exit;
-       }
        *persistent_fid = rsp->PersistentFileId;
        *volatile_fid = rsp->VolatileFileId;
 
@@ -953,7 +1027,13 @@ SMB2_open(const unsigned int xid, struct cifs_tcon *tcon, __le16 *path,
                buf->NumberOfLinks = cpu_to_le32(1);
                buf->DeletePending = 0;
        }
+
+       if (rsp->OplockLevel == SMB2_OPLOCK_LEVEL_LEASE)
+               *oplock = parse_lease_state(rsp);
+       else
+               *oplock = rsp->OplockLevel;
 creat_exit:
+       kfree(copy_path);
        free_rsp_buf(resp_buftype, rsp);
        return rc;
 }
@@ -997,11 +1077,6 @@ SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
                goto close_exit;
        }
 
-       if (rsp == NULL) {
-               rc = -EIO;
-               goto close_exit;
-       }
-
        /* BB FIXME - decode close response, update inode for caching */
 
 close_exit:
@@ -1104,13 +1179,13 @@ query_info(const unsigned int xid, struct cifs_tcon *tcon,
        iov[0].iov_len = get_rfc1002_length(req) + 4;
 
        rc = SendReceive2(xid, ses, iov, 1, &resp_buftype, 0);
+       rsp = (struct smb2_query_info_rsp *)iov[0].iov_base;
+
        if (rc) {
                cifs_stats_fail_inc(tcon, SMB2_QUERY_INFO_HE);
                goto qinf_exit;
        }
 
-       rsp = (struct smb2_query_info_rsp *)iov[0].iov_base;
-
        rc = validate_and_copy_buf(le16_to_cpu(rsp->OutputBufferOffset),
                                   le32_to_cpu(rsp->OutputBufferLength),
                                   &rsp->hdr, min_len, data);
@@ -1168,6 +1243,8 @@ SMB2_echo(struct TCP_Server_Info *server)
        struct smb2_echo_req *req;
        int rc = 0;
        struct kvec iov;
+       struct smb_rqst rqst = { .rq_iov = &iov,
+                                .rq_nvec = 1 };
 
        cFYI(1, "In echo request");
 
@@ -1181,7 +1258,7 @@ SMB2_echo(struct TCP_Server_Info *server)
        /* 4 for rfc1002 length field */
        iov.iov_len = get_rfc1002_length(req) + 4;
 
-       rc = cifs_call_async(server, &iov, 1, NULL, smb2_echo_callback, server,
+       rc = cifs_call_async(server, &rqst, NULL, smb2_echo_callback, server,
                             CIFS_ECHO_OP);
        if (rc)
                cFYI(1, "Echo request failed: %d", rc);
@@ -1292,8 +1369,14 @@ smb2_readv_callback(struct mid_q_entry *mid)
        struct cifs_readdata *rdata = mid->callback_data;
        struct cifs_tcon *tcon = tlink_tcon(rdata->cfile->tlink);
        struct TCP_Server_Info *server = tcon->ses->server;
-       struct smb2_hdr *buf = (struct smb2_hdr *)rdata->iov[0].iov_base;
+       struct smb2_hdr *buf = (struct smb2_hdr *)rdata->iov.iov_base;
        unsigned int credits_received = 1;
+       struct smb_rqst rqst = { .rq_iov = &rdata->iov,
+                                .rq_nvec = 1,
+                                .rq_pages = rdata->pages,
+                                .rq_npages = rdata->nr_pages,
+                                .rq_pagesz = rdata->pagesz,
+                                .rq_tailsz = rdata->tailsz };
 
        cFYI(1, "%s: mid=%llu state=%d result=%d bytes=%u", __func__,
                mid->mid, mid->mid_state, rdata->result, rdata->bytes);
@@ -1306,8 +1389,7 @@ smb2_readv_callback(struct mid_q_entry *mid)
                    (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) {
                        int rc;
 
-                       rc = smb2_verify_signature2(rdata->iov, rdata->nr_iov,
-                                                   server);
+                       rc = smb2_verify_signature(&rqst, server);
                        if (rc)
                                cERROR(1, "SMB signature verification returned "
                                       "error = %d", rc);
@@ -1340,6 +1422,8 @@ smb2_async_readv(struct cifs_readdata *rdata)
        int rc;
        struct smb2_hdr *buf;
        struct cifs_io_parms io_parms;
+       struct smb_rqst rqst = { .rq_iov = &rdata->iov,
+                                .rq_nvec = 1 };
 
        cFYI(1, "%s: offset=%llu bytes=%u", __func__,
                rdata->offset, rdata->bytes);
@@ -1350,20 +1434,22 @@ smb2_async_readv(struct cifs_readdata *rdata)
        io_parms.persistent_fid = rdata->cfile->fid.persistent_fid;
        io_parms.volatile_fid = rdata->cfile->fid.volatile_fid;
        io_parms.pid = rdata->pid;
-       rc = smb2_new_read_req(&rdata->iov[0], &io_parms, 0, 0);
+       rc = smb2_new_read_req(&rdata->iov, &io_parms, 0, 0);
        if (rc)
                return rc;
 
-       buf = (struct smb2_hdr *)rdata->iov[0].iov_base;
+       buf = (struct smb2_hdr *)rdata->iov.iov_base;
        /* 4 for rfc1002 length field */
-       rdata->iov[0].iov_len = get_rfc1002_length(rdata->iov[0].iov_base) + 4;
+       rdata->iov.iov_len = get_rfc1002_length(rdata->iov.iov_base) + 4;
 
        kref_get(&rdata->refcount);
-       rc = cifs_call_async(io_parms.tcon->ses->server, rdata->iov, 1,
+       rc = cifs_call_async(io_parms.tcon->ses->server, &rqst,
                             cifs_readv_receive, smb2_readv_callback,
                             rdata, 0);
-       if (rc)
+       if (rc) {
                kref_put(&rdata->refcount, cifs_readdata_release);
+               cifs_stats_fail_inc(io_parms.tcon, SMB2_READ_HE);
+       }
 
        cifs_small_buf_release(buf);
        return rc;
@@ -1476,22 +1562,16 @@ smb2_writev_callback(struct mid_q_entry *mid)
 int
 smb2_async_writev(struct cifs_writedata *wdata)
 {
-       int i, rc = -EACCES;
+       int rc = -EACCES;
        struct smb2_write_req *req = NULL;
        struct cifs_tcon *tcon = tlink_tcon(wdata->cfile->tlink);
-       struct kvec *iov = NULL;
+       struct kvec iov;
+       struct smb_rqst rqst;
 
        rc = small_smb2_init(SMB2_WRITE, tcon, (void **) &req);
        if (rc)
                goto async_writev_out;
 
-       /* 1 iov per page + 1 for header */
-       iov = kzalloc((wdata->nr_pages + 1) * sizeof(*iov), GFP_NOFS);
-       if (iov == NULL) {
-               rc = -ENOMEM;
-               goto async_writev_out;
-       }
-
        req->hdr.ProcessId = cpu_to_le32(wdata->cfile->pid);
 
        req->PersistentFileId = wdata->cfile->fid.persistent_fid;
@@ -1506,18 +1586,15 @@ smb2_async_writev(struct cifs_writedata *wdata)
        req->RemainingBytes = 0;
 
        /* 4 for rfc1002 length field and 1 for Buffer */
-       iov[0].iov_len = get_rfc1002_length(req) + 4 - 1;
-       iov[0].iov_base = (char *)req;
+       iov.iov_len = get_rfc1002_length(req) + 4 - 1;
+       iov.iov_base = req;
 
-       /*
-        * This function should marshal up the page array into the kvec
-        * array, reserving [0] for the header. It should kmap the pages
-        * and set the iov_len properly for each one. It may also set
-        * wdata->bytes too.
-        */
-       cifs_kmap_lock();
-       wdata->marshal_iov(iov, wdata);
-       cifs_kmap_unlock();
+       rqst.rq_iov = &iov;
+       rqst.rq_nvec = 1;
+       rqst.rq_pages = wdata->pages;
+       rqst.rq_npages = wdata->nr_pages;
+       rqst.rq_pagesz = wdata->pagesz;
+       rqst.rq_tailsz = wdata->tailsz;
 
        cFYI(1, "async write at %llu %u bytes", wdata->offset, wdata->bytes);
 
@@ -1526,19 +1603,16 @@ smb2_async_writev(struct cifs_writedata *wdata)
        inc_rfc1001_len(&req->hdr, wdata->bytes - 1 /* Buffer */);
 
        kref_get(&wdata->refcount);
-       rc = cifs_call_async(tcon->ses->server, iov, wdata->nr_pages + 1,
-                            NULL, smb2_writev_callback, wdata, 0);
+       rc = cifs_call_async(tcon->ses->server, &rqst, NULL,
+                               smb2_writev_callback, wdata, 0);
 
-       if (rc)
+       if (rc) {
                kref_put(&wdata->refcount, cifs_writedata_release);
-
-       /* send is done, unmap pages */
-       for (i = 0; i < wdata->nr_pages; i++)
-               kunmap(wdata->pages[i]);
+               cifs_stats_fail_inc(tcon, SMB2_WRITE_HE);
+       }
 
 async_writev_out:
        cifs_small_buf_release(req);
-       kfree(iov);
        return rc;
 }
 
@@ -1591,15 +1665,183 @@ SMB2_write(const unsigned int xid, struct cifs_io_parms *io_parms,
 
        rc = SendReceive2(xid, io_parms->tcon->ses, iov, n_vec + 1,
                          &resp_buftype, 0);
+       rsp = (struct smb2_write_rsp *)iov[0].iov_base;
 
        if (rc) {
                cifs_stats_fail_inc(io_parms->tcon, SMB2_WRITE_HE);
                cERROR(1, "Send error in write = %d", rc);
-       } else {
-               rsp = (struct smb2_write_rsp *)iov[0].iov_base;
+       } else
                *nbytes = le32_to_cpu(rsp->DataLength);
-               free_rsp_buf(resp_buftype, rsp);
+
+       free_rsp_buf(resp_buftype, rsp);
+       return rc;
+}
+
+static unsigned int
+num_entries(char *bufstart, char *end_of_buf, char **lastentry, size_t size)
+{
+       int len;
+       unsigned int entrycount = 0;
+       unsigned int next_offset = 0;
+       FILE_DIRECTORY_INFO *entryptr;
+
+       if (bufstart == NULL)
+               return 0;
+
+       entryptr = (FILE_DIRECTORY_INFO *)bufstart;
+
+       while (1) {
+               entryptr = (FILE_DIRECTORY_INFO *)
+                                       ((char *)entryptr + next_offset);
+
+               if ((char *)entryptr + size > end_of_buf) {
+                       cERROR(1, "malformed search entry would overflow");
+                       break;
+               }
+
+               len = le32_to_cpu(entryptr->FileNameLength);
+               if ((char *)entryptr + len + size > end_of_buf) {
+                       cERROR(1, "directory entry name would overflow frame "
+                                 "end of buf %p", end_of_buf);
+                       break;
+               }
+
+               *lastentry = (char *)entryptr;
+               entrycount++;
+
+               next_offset = le32_to_cpu(entryptr->NextEntryOffset);
+               if (!next_offset)
+                       break;
+       }
+
+       return entrycount;
+}
+
+/*
+ * Readdir/FindFirst
+ */
+int
+SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
+                    u64 persistent_fid, u64 volatile_fid, int index,
+                    struct cifs_search_info *srch_inf)
+{
+       struct smb2_query_directory_req *req;
+       struct smb2_query_directory_rsp *rsp = NULL;
+       struct kvec iov[2];
+       int rc = 0;
+       int len;
+       int resp_buftype;
+       unsigned char *bufptr;
+       struct TCP_Server_Info *server;
+       struct cifs_ses *ses = tcon->ses;
+       __le16 asteriks = cpu_to_le16('*');
+       char *end_of_smb;
+       unsigned int output_size = CIFSMaxBufSize;
+       size_t info_buf_size;
+
+       if (ses && (ses->server))
+               server = ses->server;
+       else
+               return -EIO;
+
+       rc = small_smb2_init(SMB2_QUERY_DIRECTORY, tcon, (void **) &req);
+       if (rc)
+               return rc;
+
+       switch (srch_inf->info_level) {
+       case SMB_FIND_FILE_DIRECTORY_INFO:
+               req->FileInformationClass = FILE_DIRECTORY_INFORMATION;
+               info_buf_size = sizeof(FILE_DIRECTORY_INFO) - 1;
+               break;
+       case SMB_FIND_FILE_ID_FULL_DIR_INFO:
+               req->FileInformationClass = FILEID_FULL_DIRECTORY_INFORMATION;
+               info_buf_size = sizeof(SEARCH_ID_FULL_DIR_INFO) - 1;
+               break;
+       default:
+               cERROR(1, "info level %u isn't supported",
+                      srch_inf->info_level);
+               rc = -EINVAL;
+               goto qdir_exit;
        }
+
+       req->FileIndex = cpu_to_le32(index);
+       req->PersistentFileId = persistent_fid;
+       req->VolatileFileId = volatile_fid;
+
+       len = 0x2;
+       bufptr = req->Buffer;
+       memcpy(bufptr, &asteriks, len);
+
+       req->FileNameOffset =
+               cpu_to_le16(sizeof(struct smb2_query_directory_req) - 1 - 4);
+       req->FileNameLength = cpu_to_le16(len);
+       /*
+        * BB could be 30 bytes or so longer if we used SMB2 specific
+        * buffer lengths, but this is safe and close enough.
+        */
+       output_size = min_t(unsigned int, output_size, server->maxBuf);
+       output_size = min_t(unsigned int, output_size, 2 << 15);
+       req->OutputBufferLength = cpu_to_le32(output_size);
+
+       iov[0].iov_base = (char *)req;
+       /* 4 for RFC1001 length and 1 for Buffer */
+       iov[0].iov_len = get_rfc1002_length(req) + 4 - 1;
+
+       iov[1].iov_base = (char *)(req->Buffer);
+       iov[1].iov_len = len;
+
+       inc_rfc1001_len(req, len - 1 /* Buffer */);
+
+       rc = SendReceive2(xid, ses, iov, 2, &resp_buftype, 0);
+       rsp = (struct smb2_query_directory_rsp *)iov[0].iov_base;
+
+       if (rc) {
+               cifs_stats_fail_inc(tcon, SMB2_QUERY_DIRECTORY_HE);
+               goto qdir_exit;
+       }
+
+       rc = validate_buf(le16_to_cpu(rsp->OutputBufferOffset),
+                         le32_to_cpu(rsp->OutputBufferLength), &rsp->hdr,
+                         info_buf_size);
+       if (rc)
+               goto qdir_exit;
+
+       srch_inf->unicode = true;
+
+       if (srch_inf->ntwrk_buf_start) {
+               if (srch_inf->smallBuf)
+                       cifs_small_buf_release(srch_inf->ntwrk_buf_start);
+               else
+                       cifs_buf_release(srch_inf->ntwrk_buf_start);
+       }
+       srch_inf->ntwrk_buf_start = (char *)rsp;
+       srch_inf->srch_entries_start = srch_inf->last_entry = 4 /* rfclen */ +
+               (char *)&rsp->hdr + le16_to_cpu(rsp->OutputBufferOffset);
+       /* 4 for rfc1002 length field */
+       end_of_smb = get_rfc1002_length(rsp) + 4 + (char *)&rsp->hdr;
+       srch_inf->entries_in_buffer =
+                       num_entries(srch_inf->srch_entries_start, end_of_smb,
+                                   &srch_inf->last_entry, info_buf_size);
+       srch_inf->index_of_last_entry += srch_inf->entries_in_buffer;
+       cFYI(1, "num entries %d last_index %lld srch start %p srch end %p",
+               srch_inf->entries_in_buffer, srch_inf->index_of_last_entry,
+               srch_inf->srch_entries_start, srch_inf->last_entry);
+       if (resp_buftype == CIFS_LARGE_BUFFER)
+               srch_inf->smallBuf = false;
+       else if (resp_buftype == CIFS_SMALL_BUFFER)
+               srch_inf->smallBuf = true;
+       else
+               cERROR(1, "illegal search buffer type");
+
+       if (rsp->hdr.Status == STATUS_NO_MORE_FILES)
+               srch_inf->endOfSearch = 1;
+       else
+               srch_inf->endOfSearch = 0;
+
+       return rc;
+
+qdir_exit:
+       free_rsp_buf(resp_buftype, rsp);
        return rc;
 }
 
@@ -1669,12 +1911,6 @@ send_set_info(const unsigned int xid, struct cifs_tcon *tcon,
                cifs_stats_fail_inc(tcon, SMB2_SET_INFO_HE);
                goto out;
        }
-
-       if (rsp == NULL) {
-               rc = -EIO;
-               goto out;
-       }
-
 out:
        free_rsp_buf(resp_buftype, rsp);
        kfree(iov);
@@ -1760,3 +1996,215 @@ SMB2_set_eof(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
        return send_set_info(xid, tcon, persistent_fid, volatile_fid, pid,
                             FILE_END_OF_FILE_INFORMATION, 1, &data, &size);
 }
+
+int
+SMB2_set_info(const unsigned int xid, struct cifs_tcon *tcon,
+             u64 persistent_fid, u64 volatile_fid, FILE_BASIC_INFO *buf)
+{
+       unsigned int size;
+       size = sizeof(FILE_BASIC_INFO);
+       return send_set_info(xid, tcon, persistent_fid, volatile_fid,
+                            current->tgid, FILE_BASIC_INFORMATION, 1,
+                            (void **)&buf, &size);
+}
+
+int
+SMB2_oplock_break(const unsigned int xid, struct cifs_tcon *tcon,
+                 const u64 persistent_fid, const u64 volatile_fid,
+                 __u8 oplock_level)
+{
+       int rc;
+       struct smb2_oplock_break *req = NULL;
+
+       cFYI(1, "SMB2_oplock_break");
+       rc = small_smb2_init(SMB2_OPLOCK_BREAK, tcon, (void **) &req);
+
+       if (rc)
+               return rc;
+
+       req->VolatileFid = volatile_fid;
+       req->PersistentFid = persistent_fid;
+       req->OplockLevel = oplock_level;
+       req->hdr.CreditRequest = cpu_to_le16(1);
+
+       rc = SendReceiveNoRsp(xid, tcon->ses, (char *) req, CIFS_OBREAK_OP);
+       /* SMB2 buffer freed by function above */
+
+       if (rc) {
+               cifs_stats_fail_inc(tcon, SMB2_OPLOCK_BREAK_HE);
+               cFYI(1, "Send error in Oplock Break = %d", rc);
+       }
+
+       return rc;
+}
+
+static void
+copy_fs_info_to_kstatfs(struct smb2_fs_full_size_info *pfs_inf,
+                       struct kstatfs *kst)
+{
+       kst->f_bsize = le32_to_cpu(pfs_inf->BytesPerSector) *
+                         le32_to_cpu(pfs_inf->SectorsPerAllocationUnit);
+       kst->f_blocks = le64_to_cpu(pfs_inf->TotalAllocationUnits);
+       kst->f_bfree  = le64_to_cpu(pfs_inf->ActualAvailableAllocationUnits);
+       kst->f_bavail = le64_to_cpu(pfs_inf->CallerAvailableAllocationUnits);
+       return;
+}
+
+static int
+build_qfs_info_req(struct kvec *iov, struct cifs_tcon *tcon, int level,
+                  int outbuf_len, u64 persistent_fid, u64 volatile_fid)
+{
+       int rc;
+       struct smb2_query_info_req *req;
+
+       cFYI(1, "Query FSInfo level %d", level);
+
+       if ((tcon->ses == NULL) || (tcon->ses->server == NULL))
+               return -EIO;
+
+       rc = small_smb2_init(SMB2_QUERY_INFO, tcon, (void **) &req);
+       if (rc)
+               return rc;
+
+       req->InfoType = SMB2_O_INFO_FILESYSTEM;
+       req->FileInfoClass = level;
+       req->PersistentFileId = persistent_fid;
+       req->VolatileFileId = volatile_fid;
+       /* 4 for rfc1002 length field and 1 for pad */
+       req->InputBufferOffset =
+                       cpu_to_le16(sizeof(struct smb2_query_info_req) - 1 - 4);
+       req->OutputBufferLength = cpu_to_le32(
+               outbuf_len + sizeof(struct smb2_query_info_rsp) - 1 - 4);
+
+       iov->iov_base = (char *)req;
+       /* 4 for rfc1002 length field */
+       iov->iov_len = get_rfc1002_length(req) + 4;
+       return 0;
+}
+
+int
+SMB2_QFS_info(const unsigned int xid, struct cifs_tcon *tcon,
+             u64 persistent_fid, u64 volatile_fid, struct kstatfs *fsdata)
+{
+       struct smb2_query_info_rsp *rsp = NULL;
+       struct kvec iov;
+       int rc = 0;
+       int resp_buftype;
+       struct cifs_ses *ses = tcon->ses;
+       struct smb2_fs_full_size_info *info = NULL;
+
+       rc = build_qfs_info_req(&iov, tcon, FS_FULL_SIZE_INFORMATION,
+                               sizeof(struct smb2_fs_full_size_info),
+                               persistent_fid, volatile_fid);
+       if (rc)
+               return rc;
+
+       rc = SendReceive2(xid, ses, &iov, 1, &resp_buftype, 0);
+       if (rc) {
+               cifs_stats_fail_inc(tcon, SMB2_QUERY_INFO_HE);
+               goto qinf_exit;
+       }
+       rsp = (struct smb2_query_info_rsp *)iov.iov_base;
+
+       info = (struct smb2_fs_full_size_info *)(4 /* RFC1001 len */ +
+               le16_to_cpu(rsp->OutputBufferOffset) + (char *)&rsp->hdr);
+       rc = validate_buf(le16_to_cpu(rsp->OutputBufferOffset),
+                         le32_to_cpu(rsp->OutputBufferLength), &rsp->hdr,
+                         sizeof(struct smb2_fs_full_size_info));
+       if (!rc)
+               copy_fs_info_to_kstatfs(info, fsdata);
+
+qinf_exit:
+       free_rsp_buf(resp_buftype, iov.iov_base);
+       return rc;
+}
+
+int
+smb2_lockv(const unsigned int xid, struct cifs_tcon *tcon,
+          const __u64 persist_fid, const __u64 volatile_fid, const __u32 pid,
+          const __u32 num_lock, struct smb2_lock_element *buf)
+{
+       int rc = 0;
+       struct smb2_lock_req *req = NULL;
+       struct kvec iov[2];
+       int resp_buf_type;
+       unsigned int count;
+
+       cFYI(1, "smb2_lockv num lock %d", num_lock);
+
+       rc = small_smb2_init(SMB2_LOCK, tcon, (void **) &req);
+       if (rc)
+               return rc;
+
+       req->hdr.ProcessId = cpu_to_le32(pid);
+       req->LockCount = cpu_to_le16(num_lock);
+
+       req->PersistentFileId = persist_fid;
+       req->VolatileFileId = volatile_fid;
+
+       count = num_lock * sizeof(struct smb2_lock_element);
+       inc_rfc1001_len(req, count - sizeof(struct smb2_lock_element));
+
+       iov[0].iov_base = (char *)req;
+       /* 4 for rfc1002 length field and count for all locks */
+       iov[0].iov_len = get_rfc1002_length(req) + 4 - count;
+       iov[1].iov_base = (char *)buf;
+       iov[1].iov_len = count;
+
+       cifs_stats_inc(&tcon->stats.cifs_stats.num_locks);
+       rc = SendReceive2(xid, tcon->ses, iov, 2, &resp_buf_type, CIFS_NO_RESP);
+       if (rc) {
+               cFYI(1, "Send error in smb2_lockv = %d", rc);
+               cifs_stats_fail_inc(tcon, SMB2_LOCK_HE);
+       }
+
+       return rc;
+}
+
+int
+SMB2_lock(const unsigned int xid, struct cifs_tcon *tcon,
+         const __u64 persist_fid, const __u64 volatile_fid, const __u32 pid,
+         const __u64 length, const __u64 offset, const __u32 lock_flags,
+         const bool wait)
+{
+       struct smb2_lock_element lock;
+
+       lock.Offset = cpu_to_le64(offset);
+       lock.Length = cpu_to_le64(length);
+       lock.Flags = cpu_to_le32(lock_flags);
+       if (!wait && lock_flags != SMB2_LOCKFLAG_UNLOCK)
+               lock.Flags |= cpu_to_le32(SMB2_LOCKFLAG_FAIL_IMMEDIATELY);
+
+       return smb2_lockv(xid, tcon, persist_fid, volatile_fid, pid, 1, &lock);
+}
+
+int
+SMB2_lease_break(const unsigned int xid, struct cifs_tcon *tcon,
+                __u8 *lease_key, const __le32 lease_state)
+{
+       int rc;
+       struct smb2_lease_ack *req = NULL;
+
+       cFYI(1, "SMB2_lease_break");
+       rc = small_smb2_init(SMB2_OPLOCK_BREAK, tcon, (void **) &req);
+
+       if (rc)
+               return rc;
+
+       req->hdr.CreditRequest = cpu_to_le16(1);
+       req->StructureSize = cpu_to_le16(36);
+       inc_rfc1001_len(req, 12);
+
+       memcpy(req->LeaseKey, lease_key, 16);
+       req->LeaseState = lease_state;
+
+       rc = SendReceiveNoRsp(xid, tcon->ses, (char *) req, CIFS_OBREAK_OP);
+       /* SMB2 buffer freed by function above */
+
+       if (rc) {
+               cifs_stats_fail_inc(tcon, SMB2_OPLOCK_BREAK_HE);
+               cFYI(1, "Send error in Lease Break = %d", rc);
+       }
+
+       return rc;
+}