Commit 661bb943 authored by Ronnie Sahlberg's avatar Ronnie Sahlberg Committed by Steve French
Browse files

cifs: remove rfc1002 header from smb2_tree_connect_req 



Signed-off-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Reviewed-by: default avatarAurelien Aptel <aaptel@suse.com>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
Acked-by: default avatarPavel Shilovsky <pshilov@microsoft.com>
parent 7f7ae759

fs/cifs/smb2pdu.c

+9 −9
Original line number Diff line number Diff line
@@ -1276,6 +1276,7 @@ SMB2_tcon(const unsigned int xid, struct cifs_ses *ses, const char *tree, 
	int unc_path_len;

	__le16 *unc_path = NULL;

	int flags = 0;

	unsigned int total_len;



	cifs_dbg(FYI, "TCON\n");
@@ -1297,7 +1298,8 @@ SMB2_tcon(const unsigned int xid, struct cifs_ses *ses, const char *tree, 
	if (tcon)

		tcon->tid = 0;



	rc = small_smb2_init(SMB2_TREE_CONNECT, tcon, (void **) &req);

	rc = smb2_plain_req_init(SMB2_TREE_CONNECT, tcon, (void **) &req,

			     &total_len);

	if (rc) {

		kfree(unc_path);

		return rc;
@@ -1308,26 +1310,24 @@ SMB2_tcon(const unsigned int xid, struct cifs_ses *ses, const char *tree, 
			flags |= CIFS_TRANSFORM_REQ;



		/* since no tcon, smb2_init can not do this, so do here */

		req->hdr.sync_hdr.SessionId = ses->Suid;

		req->sync_hdr.SessionId = ses->Suid;

		if (ses->server->sign)

			req->hdr.sync_hdr.Flags |= SMB2_FLAGS_SIGNED;

			req->sync_hdr.Flags |= SMB2_FLAGS_SIGNED;

	} else if (encryption_required(tcon))

		flags |= CIFS_TRANSFORM_REQ;



	iov[0].iov_base = (char *)req;

	/* 4 for rfc1002 length field and 1 for pad */

	iov[0].iov_len = get_rfc1002_length(req) + 4 - 1;

	/* 1 for pad */

	iov[0].iov_len = total_len - 1;



	/* Testing shows that buffer offset must be at location of Buffer[0] */

	req->PathOffset = cpu_to_le16(sizeof(struct smb2_tree_connect_req)

			- 1 /* pad */ - 4 /* do not count rfc1001 len field */);

			- 1 /* pad */);

	req->PathLength = cpu_to_le16(unc_path_len - 2);

	iov[1].iov_base = unc_path;

	iov[1].iov_len = unc_path_len;



	inc_rfc1001_len(req, unc_path_len - 1 /* pad */);



	rc = SendReceive2(xid, ses, iov, 2, &resp_buftype, flags, &rsp_iov);

	rc = smb2_send_recv(xid, ses, iov, 2, &resp_buftype, flags, &rsp_iov);

	cifs_small_buf_release(req);

	rsp = (struct smb2_tree_connect_rsp *)rsp_iov.iov_base;

fs/cifs/smb2pdu.h

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ struct smb2_logoff_rsp { 
#define SMB2_SHAREFLAG_CLUSTER_RECONNECT	0x0001



struct smb2_tree_connect_req {

	struct smb2_hdr hdr;

	struct smb2_sync_hdr sync_hdr;

	__le16 StructureSize;	/* Must be 9 */

	__le16 Reserved; /* Flags in SMB3.1.1 */

	__le16 PathOffset;