Skip to content

Commit af36c51

Browse files
ddisssmfrench
authored andcommitted
ksmbd: remove unused compression negotiate ctx packing
build_compression_ctxt() is currently unreachable due to conn.compress_algorithm remaining zero (SMB3_COMPRESS_NONE). It appears to have been broken in a couple of subtle ways over the years: - prior to d6c9ad2 ("ksmbd: use the common definitions for NEGOTIATE_PROTOCOL") smb2_compression_ctx.DataLength was set to 8, which didn't account for the single CompressionAlgorithms flexible array member. - post d6c9ad2 smb2_compression_capabilities_context CompressionAlgorithms is a three member array, while CompressionAlgorithmCount is set to indicate only one member. assemble_neg_contexts() ctxt_size is also incorrectly incremented by sizeof(struct smb2_compression_capabilities_context) + 2, which assumes one flexible array member. Signed-off-by: David Disseldorp <ddiss@suse.de> Acked-by: Namjae Jeon <linkinjeon@kernel.org> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent a12a07a commit af36c51

1 file changed

Lines changed: 2 additions & 24 deletions

File tree

fs/ksmbd/smb2pdu.c

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -756,19 +756,6 @@ static void build_encrypt_ctxt(struct smb2_encryption_neg_context *pneg_ctxt,
756756
pneg_ctxt->Ciphers[0] = cipher_type;
757757
}
758758

759-
static void build_compression_ctxt(struct smb2_compression_capabilities_context *pneg_ctxt,
760-
__le16 comp_algo)
761-
{
762-
pneg_ctxt->ContextType = SMB2_COMPRESSION_CAPABILITIES;
763-
pneg_ctxt->DataLength =
764-
cpu_to_le16(sizeof(struct smb2_compression_capabilities_context)
765-
- sizeof(struct smb2_neg_context));
766-
pneg_ctxt->Reserved = cpu_to_le32(0);
767-
pneg_ctxt->CompressionAlgorithmCount = cpu_to_le16(1);
768-
pneg_ctxt->Flags = cpu_to_le32(0);
769-
pneg_ctxt->CompressionAlgorithms[0] = comp_algo;
770-
}
771-
772759
static void build_sign_cap_ctxt(struct smb2_signing_capabilities *pneg_ctxt,
773760
__le16 sign_algo)
774761
{
@@ -832,17 +819,8 @@ static void assemble_neg_contexts(struct ksmbd_conn *conn,
832819
ctxt_size += sizeof(struct smb2_encryption_neg_context) + 2;
833820
}
834821

835-
if (conn->compress_algorithm) {
836-
ctxt_size = round_up(ctxt_size, 8);
837-
ksmbd_debug(SMB,
838-
"assemble SMB2_COMPRESSION_CAPABILITIES context\n");
839-
/* Temporarily set to SMB3_COMPRESS_NONE */
840-
build_compression_ctxt((struct smb2_compression_capabilities_context *)
841-
(pneg_ctxt + ctxt_size),
842-
conn->compress_algorithm);
843-
neg_ctxt_cnt++;
844-
ctxt_size += sizeof(struct smb2_compression_capabilities_context) + 2;
845-
}
822+
/* compression context not yet supported */
823+
WARN_ON(conn->compress_algorithm != SMB3_COMPRESS_NONE);
846824

847825
if (conn->posix_ext_supported) {
848826
ctxt_size = round_up(ctxt_size, 8);

0 commit comments

Comments
 (0)