Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7c43966 authored Apr 25, 2018 by Long Li Committed by Steve French May 09, 2018

cifs: smbd: Enable signing with smbdirect



Now signing is supported with RDMA transport.

Remove the code that disabled it.

Signed-off-by: Long Li <longli@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>

parent 2796d303

fs/cifs/connect.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -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) {

fs/cifs/smb2pdu.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -738,11 +738,6 @@ int smb3_validate_negotiate(const unsigned int xid, struct cifs_tcon *tcon)

		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;