Skip to content

Commit 8aff8b8

Browse files
Steve Frenchgregkh
authored andcommitted
smb311: additional compression flag defined in updated protocol spec
[ Upstream commit e56bc74 ] Added new compression flag that was recently documented, in addition fix some typos and clarify the sid_attr_data struct definition. Reviewed-by: Bharath SM <bharathsm@microsoft.com> Signed-off-by: Steve French <stfrench@microsoft.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent a9aa7a7 commit 8aff8b8

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

fs/smb/common/smb2pdu.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,15 +280,16 @@ struct smb3_blob_data {
280280
#define SE_GROUP_RESOURCE 0x20000000
281281
#define SE_GROUP_LOGON_ID 0xC0000000
282282

283-
/* struct sid_attr_data is SidData array in BlobData format then le32 Attr */
284-
285283
struct sid_array_data {
286284
__le16 SidAttrCount;
287285
/* SidAttrList - array of sid_attr_data structs */
288286
} __packed;
289287

290-
struct luid_attr_data {
291-
288+
/* struct sid_attr_data is SidData array in BlobData format then le32 Attr */
289+
struct sid_attr_data {
290+
__le16 BlobSize;
291+
__u8 BlobData[];
292+
/* __le32 Attr */
292293
} __packed;
293294

294295
/*
@@ -502,6 +503,7 @@ struct smb2_encryption_neg_context {
502503
#define SMB3_COMPRESS_LZ77_HUFF cpu_to_le16(0x0003)
503504
/* Pattern scanning algorithm See MS-SMB2 3.1.4.4.1 */
504505
#define SMB3_COMPRESS_PATTERN cpu_to_le16(0x0004) /* Pattern_V1 */
506+
#define SMB3_COMPRESS_LZ4 cpu_to_le16(0x0005)
505507

506508
/* Compression Flags */
507509
#define SMB2_COMPRESSION_CAPABILITIES_FLAG_NONE cpu_to_le32(0x00000000)

0 commit comments

Comments
 (0)