Commit 34e8ccf9 authored by David Disseldorp's avatar David Disseldorp Committed by Steve French
Browse files

ksmbd: set NegotiateContextCount once instead of every inc 



There are no early returns, so marshalling the incremented
NegotiateContextCount with every context is unnecessary.

Signed-off-by: default avatarDavid Disseldorp <ddiss@suse.de>
Acked-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 42bc6793

fs/ksmbd/smb2pdu.c

+5 −5
Original line number Diff line number Diff line
@@ -817,7 +817,6 @@ static void assemble_neg_contexts(struct ksmbd_conn *conn, 
		    "assemble SMB2_PREAUTH_INTEGRITY_CAPABILITIES context\n");

	build_preauth_ctxt((struct smb2_preauth_neg_context *)pneg_ctxt,

			   conn->preauth_info->Preauth_HashId);

	rsp->NegotiateContextCount = cpu_to_le16(neg_ctxt_cnt);

	inc_rfc1001_len(smb2_buf_len, AUTH_GSS_PADDING);

	ctxt_size = sizeof(struct smb2_preauth_neg_context);

	/* Round to 8 byte boundary */
@@ -829,7 +828,7 @@ static void assemble_neg_contexts(struct ksmbd_conn *conn, 
			    "assemble SMB2_ENCRYPTION_CAPABILITIES context\n");

		build_encrypt_ctxt((struct smb2_encryption_neg_context *)pneg_ctxt,

				   conn->cipher_type);

		rsp->NegotiateContextCount = cpu_to_le16(++neg_ctxt_cnt);

		neg_ctxt_cnt++;

		ctxt_size += sizeof(struct smb2_encryption_neg_context) + 2;

		/* Round to 8 byte boundary */

		pneg_ctxt +=
@@ -844,7 +843,7 @@ static void assemble_neg_contexts(struct ksmbd_conn *conn, 
		/* Temporarily set to SMB3_COMPRESS_NONE */

		build_compression_ctxt((struct smb2_compression_capabilities_context *)pneg_ctxt,

				       conn->compress_algorithm);

		rsp->NegotiateContextCount = cpu_to_le16(++neg_ctxt_cnt);

		neg_ctxt_cnt++;

		ctxt_size += sizeof(struct smb2_compression_capabilities_context) + 2;

		/* Round to 8 byte boundary */

		pneg_ctxt += round_up(sizeof(struct smb2_compression_capabilities_context) + 2,
@@ -856,7 +855,7 @@ static void assemble_neg_contexts(struct ksmbd_conn *conn, 
		ksmbd_debug(SMB,

			    "assemble SMB2_POSIX_EXTENSIONS_AVAILABLE context\n");

		build_posix_ctxt((struct smb2_posix_neg_context *)pneg_ctxt);

		rsp->NegotiateContextCount = cpu_to_le16(++neg_ctxt_cnt);

		neg_ctxt_cnt++;

		ctxt_size += sizeof(struct smb2_posix_neg_context);

		/* Round to 8 byte boundary */

		pneg_ctxt += round_up(sizeof(struct smb2_posix_neg_context), 8);
@@ -868,10 +867,11 @@ static void assemble_neg_contexts(struct ksmbd_conn *conn, 
			    "assemble SMB2_SIGNING_CAPABILITIES context\n");

		build_sign_cap_ctxt((struct smb2_signing_capabilities *)pneg_ctxt,

				    conn->signing_algorithm);

		rsp->NegotiateContextCount = cpu_to_le16(++neg_ctxt_cnt);

		neg_ctxt_cnt++;

		ctxt_size += sizeof(struct smb2_signing_capabilities) + 2;

	}



	rsp->NegotiateContextCount = cpu_to_le16(neg_ctxt_cnt);

	inc_rfc1001_len(smb2_buf_len, ctxt_size);

}