Commit 8801e902 authored by Long Li's avatar Long Li Committed by Steve French
Browse files

CIFS: SMBD: Disable signing on SMB direct transport 



Currently the CIFS SMB Direct implementation (experimental) doesn't properly
support signing. Disable it when SMB Direct is in use for transport.

Signing will be enabled in future after it is implemented.

Signed-off-by: default avatarLong Li <longli@microsoft.com>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
Reviewed-by: default avatarPavel Shilovsky <pshilov@microsoft.com>
Reviewed-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
parent 08a3b969

fs/cifs/connect.c

+8 −0
Original line number Diff line number Diff line
@@ -1968,6 +1968,14 @@ 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

+5 −0
Original line number Diff line number Diff line
@@ -616,6 +616,11 @@ 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



	/*

	 * validation ioctl must be signed, so no point sending this if we

	 * can not sign it (ie are not known user).  Even if signing is not

CRA Git | Maintained and supported by SUSTech CRA and CCSE