Skip to content

Commit 523ecd9

Browse files
ChenXiaoSongsmfrench
authored andcommitted
smb: rename to STATUS_SMB_NO_PREAUTH_INTEGRITY_HASH_OVERLAP
See MS-SMB2 3.3.5.4. To keep the name consistent with the documentation. Additionally, move STATUS_INVALID_LOCK_RANGE to correct position in order. Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent bf80d15 commit 523ecd9

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

fs/smb/common/smb2status.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -631,6 +631,7 @@ struct ntstatus {
631631
#define STATUS_DOMAIN_TRUST_INCONSISTENT cpu_to_le32(0xC000019B)
632632
#define STATUS_FS_DRIVER_REQUIRED cpu_to_le32(0xC000019C)
633633
#define STATUS_IMAGE_ALREADY_LOADED_AS_DLL cpu_to_le32(0xC000019D)
634+
#define STATUS_INVALID_LOCK_RANGE cpu_to_le32(0xC00001A1)
634635
#define STATUS_NETWORK_OPEN_RESTRICTION cpu_to_le32(0xC0000201)
635636
#define STATUS_NO_USER_SESSION_KEY cpu_to_le32(0xC0000202)
636637
#define STATUS_USER_SESSION_DELETED cpu_to_le32(0xC0000203)
@@ -1773,5 +1774,5 @@ struct ntstatus {
17731774
#define STATUS_IPSEC_INVALID_PACKET cpu_to_le32(0xC0360005)
17741775
#define STATUS_IPSEC_INTEGRITY_CHECK_FAILED cpu_to_le32(0xC0360006)
17751776
#define STATUS_IPSEC_CLEAR_TEXT_DROP cpu_to_le32(0xC0360007)
1776-
#define STATUS_NO_PREAUTH_INTEGRITY_HASH_OVERLAP cpu_to_le32(0xC05D0000)
1777-
#define STATUS_INVALID_LOCK_RANGE cpu_to_le32(0xC00001a1)
1777+
/* See MS-SMB2 3.3.5.4 */
1778+
#define STATUS_SMB_NO_PREAUTH_INTEGRITY_HASH_OVERLAP cpu_to_le32(0xC05D0000)

fs/smb/server/smb2pdu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -896,7 +896,7 @@ static __le32 decode_preauth_ctxt(struct ksmbd_conn *conn,
896896
return STATUS_INVALID_PARAMETER;
897897

898898
if (pneg_ctxt->HashAlgorithms != SMB2_PREAUTH_INTEGRITY_SHA512)
899-
return STATUS_NO_PREAUTH_INTEGRITY_HASH_OVERLAP;
899+
return STATUS_SMB_NO_PREAUTH_INTEGRITY_HASH_OVERLAP;
900900

901901
conn->preauth_info->Preauth_HashId = SMB2_PREAUTH_INTEGRITY_SHA512;
902902
return STATUS_SUCCESS;

0 commit comments

Comments
 (0)