Merge tag '4.17-rc4-SMB3-Fixes' of git://git.samba.org/sfrench/cifs-2.6

Pull cifs fixes from Steve French:
 "Some small SMB3 fixes for 4.17-rc5, some for stable"

* tag '4.17-rc4-SMB3-Fixes' of git://git.samba.org/sfrench/cifs-2.6:
  smb3: directory sync should not return an error
  cifs: smb2ops: Fix listxattr() when there are no EAs
  cifs: smbd: Enable signing with smbdirect
  cifs: Allocate validate negotiation request through kmalloc

4 files changed, 57 insertions, 43 deletions

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index f715609b13f3..5a5a0158cc8f 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -1047,6 +1047,18 @@ out:
         return rc;
 }
 
+/*
+ * Directory operations under CIFS/SMB2/SMB3 are synchronous, so fsync()
+ * is a dummy operation.
+ */
+static int cifs_dir_fsync(struct file *file, loff_t start, loff_t end, int datasync)
+{
+        cifs_dbg(FYI, "Sync directory - name: %pD datasync: 0x%x\n",
+                 file, datasync);
+
+        return 0;
+}
+
 static ssize_t cifs_copy_file_range(struct file *src_file, loff_t off,
                                 struct file *dst_file, loff_t destoff,
                                 size_t len, unsigned int flags)
@@ -1181,6 +1193,7 @@ const struct file_operations cifs_dir_ops = {
         .copy_file_range = cifs_copy_file_range,
         .clone_file_range = cifs_clone_file_range,
         .llseek = generic_file_llseek,
+        .fsync = cifs_dir_fsync,
 };
 
 static void
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index a5aa158d535a..7a10a5d0731f 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -1977,14 +1977,6 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
                 goto cifs_parse_mount_err;
         }
 
-#ifdef CONFIG_CIFS_SMB_DIRECT
-        if (vol->rdma && vol->sign) {
-                cifs_dbg(VFS, "Currently SMB direct doesn't support signing."
-                        " This is being fixed\n");
-                goto cifs_parse_mount_err;
-        }
-#endif
-
 #ifndef CONFIG_KEYS
         /* Muliuser mounts require CONFIG_KEYS support */
         if (vol->multiuser) {
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index b76b85881dcc..9c6d95ffca97 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -589,9 +589,15 @@ smb2_query_eas(const unsigned int xid, struct cifs_tcon *tcon,
 
         SMB2_close(xid, tcon, fid.persistent_fid, fid.volatile_fid);
 
+        /*
+         * If ea_name is NULL (listxattr) and there are no EAs, return 0 as it's
+         * not an error. Otherwise, the specified ea_name was not found.
+         */
         if (!rc)
                 rc = move_smb2_ea_to_cifs(ea_data, buf_size, smb2_data,
                                           SMB2_MAX_EA_BUF, ea_name);
+        else if (!ea_name && rc == -ENODATA)
+                rc = 0;
 
         kfree(smb2_data);
         return rc;
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index 60db51bae0e3..0f48741a0130 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -730,19 +730,14 @@ neg_exit:
 
 int smb3_validate_negotiate(const unsigned int xid, struct cifs_tcon *tcon)
 {
-        int rc = 0;
-        struct validate_negotiate_info_req vneg_inbuf;
+        int rc;
+        struct validate_negotiate_info_req *pneg_inbuf;
         struct validate_negotiate_info_rsp *pneg_rsp = NULL;
         u32 rsplen;
         u32 inbuflen; /* max of 4 dialects */
 
         cifs_dbg(FYI, "validate negotiate\n");
 
-#ifdef CONFIG_CIFS_SMB_DIRECT
-        if (tcon->ses->server->rdma)
-                return 0;
-#endif
-
         /* In SMB3.11 preauth integrity supersedes validate negotiate */
         if (tcon->ses->server->dialect == SMB311_PROT_ID)
                 return 0;
@@ -765,63 +760,69 @@ int smb3_validate_negotiate(const unsigned int xid, struct cifs_tcon *tcon)
         if (tcon->ses->session_flags & SMB2_SESSION_FLAG_IS_NULL)
                 cifs_dbg(VFS, "Unexpected null user (anonymous) auth flag sent by server\n");
 
-        vneg_inbuf.Capabilities =
+        pneg_inbuf = kmalloc(sizeof(*pneg_inbuf), GFP_NOFS);
+        if (!pneg_inbuf)
+                return -ENOMEM;
+
+        pneg_inbuf->Capabilities =
                         cpu_to_le32(tcon->ses->server->vals->req_capabilities);
-        memcpy(vneg_inbuf.Guid, tcon->ses->server->client_guid,
+        memcpy(pneg_inbuf->Guid, tcon->ses->server->client_guid,
                                         SMB2_CLIENT_GUID_SIZE);
 
         if (tcon->ses->sign)
-                vneg_inbuf.SecurityMode =
+                pneg_inbuf->SecurityMode =
                         cpu_to_le16(SMB2_NEGOTIATE_SIGNING_REQUIRED);
         else if (global_secflags & CIFSSEC_MAY_SIGN)
-                vneg_inbuf.SecurityMode =
+                pneg_inbuf->SecurityMode =
                         cpu_to_le16(SMB2_NEGOTIATE_SIGNING_ENABLED);
         else
-                vneg_inbuf.SecurityMode = 0;
+                pneg_inbuf->SecurityMode = 0;
 
 
         if (strcmp(tcon->ses->server->vals->version_string,
                 SMB3ANY_VERSION_STRING) == 0) {
-                vneg_inbuf.Dialects[0] = cpu_to_le16(SMB30_PROT_ID);
-                vneg_inbuf.Dialects[1] = cpu_to_le16(SMB302_PROT_ID);
-                vneg_inbuf.DialectCount = cpu_to_le16(2);
+                pneg_inbuf->Dialects[0] = cpu_to_le16(SMB30_PROT_ID);
+                pneg_inbuf->Dialects[1] = cpu_to_le16(SMB302_PROT_ID);
+                pneg_inbuf->DialectCount = cpu_to_le16(2);
                 /* structure is big enough for 3 dialects, sending only 2 */
-                inbuflen = sizeof(struct validate_negotiate_info_req) - 2;
+                inbuflen = sizeof(*pneg_inbuf) -
+                                sizeof(pneg_inbuf->Dialects[0]);
         } else if (strcmp(tcon->ses->server->vals->version_string,
                 SMBDEFAULT_VERSION_STRING) == 0) {
-                vneg_inbuf.Dialects[0] = cpu_to_le16(SMB21_PROT_ID);
-                vneg_inbuf.Dialects[1] = cpu_to_le16(SMB30_PROT_ID);
-                vneg_inbuf.Dialects[2] = cpu_to_le16(SMB302_PROT_ID);
-                vneg_inbuf.DialectCount = cpu_to_le16(3);
+                pneg_inbuf->Dialects[0] = cpu_to_le16(SMB21_PROT_ID);
+                pneg_inbuf->Dialects[1] = cpu_to_le16(SMB30_PROT_ID);
+                pneg_inbuf->Dialects[2] = cpu_to_le16(SMB302_PROT_ID);
+                pneg_inbuf->DialectCount = cpu_to_le16(3);
                 /* structure is big enough for 3 dialects */
-                inbuflen = sizeof(struct validate_negotiate_info_req);
+                inbuflen = sizeof(*pneg_inbuf);
         } else {
                 /* otherwise specific dialect was requested */
-                vneg_inbuf.Dialects[0] =
+                pneg_inbuf->Dialects[0] =
                         cpu_to_le16(tcon->ses->server->vals->protocol_id);
-                vneg_inbuf.DialectCount = cpu_to_le16(1);
+                pneg_inbuf->DialectCount = cpu_to_le16(1);
                 /* structure is big enough for 3 dialects, sending only 1 */
-                inbuflen = sizeof(struct validate_negotiate_info_req) - 4;
+                inbuflen = sizeof(*pneg_inbuf) -
+                                sizeof(pneg_inbuf->Dialects[0]) * 2;
         }
 
         rc = SMB2_ioctl(xid, tcon, NO_FILE_ID, NO_FILE_ID,
                 FSCTL_VALIDATE_NEGOTIATE_INFO, true /* is_fsctl */,
-                (char *)&vneg_inbuf, sizeof(struct validate_negotiate_info_req),
-                (char **)&pneg_rsp, &rsplen);
+                (char *)pneg_inbuf, inbuflen, (char **)&pneg_rsp, &rsplen);
 
         if (rc != 0) {
                 cifs_dbg(VFS, "validate protocol negotiate failed: %d\n", rc);
-                return -EIO;
+                rc = -EIO;
+                goto out_free_inbuf;
         }
 
-        if (rsplen != sizeof(struct validate_negotiate_info_rsp)) {
+        rc = -EIO;
+        if (rsplen != sizeof(*pneg_rsp)) {
                 cifs_dbg(VFS, "invalid protocol negotiate response size: %d\n",
                          rsplen);
 
                 /* relax check since Mac returns max bufsize allowed on ioctl */
-                if ((rsplen > CIFSMaxBufSize)
-                     || (rsplen < sizeof(struct validate_negotiate_info_rsp)))
-                        goto err_rsp_free;
+                if (rsplen > CIFSMaxBufSize || rsplen < sizeof(*pneg_rsp))
+                        goto out_free_rsp;
         }
 
         /* check validate negotiate info response matches what we got earlier */
@@ -838,15 +839,17 @@ int smb3_validate_negotiate(const unsigned int xid, struct cifs_tcon *tcon)
                 goto vneg_out;
 
         /* validate negotiate successful */
+        rc = 0;
         cifs_dbg(FYI, "validate negotiate info successful\n");
-        kfree(pneg_rsp);
-        return 0;
+        goto out_free_rsp;
 
 vneg_out:
         cifs_dbg(VFS, "protocol revalidation - security settings mismatch\n");
-err_rsp_free:
+out_free_rsp:
         kfree(pneg_rsp);
-        return -EIO;
+out_free_inbuf:
+        kfree(pneg_inbuf);
+        return rc;
 }
 
 enum securityEnum