ksmbd: set NegotiateContextCount once instead of every inc

[ Upstream commit 34e8ccf9ce24b6b2e275bbe35cd392e18fbbd369 ]

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

Signed-off-by: David Disseldorp <ddiss@suse.de>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c
index ee128f5d38c354e2df6f8210ba5daabec51889c5..c7d43c83d2335c45030388e958e0ce3d8c816d24 100644 (file)
--- a/fs/smb/server/smb2pdu.c
+++ b/fs/smb/server/smb2pdu.c
@@ -847,7 +847,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 */
@@ -859,7 +858,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 +=
@@ -874,7 +873,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,
@@ -886,7 +885,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);
@@ -898,10 +897,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);
 }