ksmbd: set NegotiateContextCount once instead of every inc
Subsystems (2)
PATCH 1/1 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 David Disseldorp <[email protected]>
--- fs/ksmbd/smb2pdu.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
fs/ksmbd/smb2pdu.c +5 -5
@@ -808,7 +808,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 */
@@ -820,7 +819,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 +=
@@ -835,7 +834,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,
@@ -847,7 +846,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 );
@@ -859,10 +858,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); }
Signature · 1 line
2.35.3
2023-04-03 18:29 GMT+09:00, David Disseldorp <[email protected]>:
Quoted 4 lines
There are no early returns, so marshalling the incremented NegotiateContextCount with every context is unnecessary.
Signed-off-by David Disseldorp <[email protected]>
Acked-by Namjae Jeon <[email protected]>
Thanks for your patch!