Commit 523ecd97 authored by ChenXiaoSong's avatar ChenXiaoSong Committed by Steve French
Browse files

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: default avatarChenXiaoSong <chenxiaosong@kylinos.cn>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent bf80d151

fs/smb/common/smb2status.h

+3 −2
Original line number Diff line number Diff line
@@ -631,6 +631,7 @@ struct ntstatus { 
#define STATUS_DOMAIN_TRUST_INCONSISTENT cpu_to_le32(0xC000019B)

#define STATUS_FS_DRIVER_REQUIRED cpu_to_le32(0xC000019C)

#define STATUS_IMAGE_ALREADY_LOADED_AS_DLL cpu_to_le32(0xC000019D)

#define STATUS_INVALID_LOCK_RANGE cpu_to_le32(0xC00001A1)

#define STATUS_NETWORK_OPEN_RESTRICTION cpu_to_le32(0xC0000201)

#define STATUS_NO_USER_SESSION_KEY cpu_to_le32(0xC0000202)

#define STATUS_USER_SESSION_DELETED cpu_to_le32(0xC0000203)
@@ -1773,5 +1774,5 @@ struct ntstatus { 
#define STATUS_IPSEC_INVALID_PACKET cpu_to_le32(0xC0360005)

#define STATUS_IPSEC_INTEGRITY_CHECK_FAILED cpu_to_le32(0xC0360006)

#define STATUS_IPSEC_CLEAR_TEXT_DROP cpu_to_le32(0xC0360007)

#define STATUS_NO_PREAUTH_INTEGRITY_HASH_OVERLAP cpu_to_le32(0xC05D0000)

#define STATUS_INVALID_LOCK_RANGE cpu_to_le32(0xC00001a1)
 
/* See MS-SMB2 3.3.5.4 */

#define STATUS_SMB_NO_PREAUTH_INTEGRITY_HASH_OVERLAP cpu_to_le32(0xC05D0000)

fs/smb/server/smb2pdu.c

+1 −1
Original line number Diff line number Diff line
@@ -896,7 +896,7 @@ static __le32 decode_preauth_ctxt(struct ksmbd_conn *conn, 
		return STATUS_INVALID_PARAMETER;



	if (pneg_ctxt->HashAlgorithms != SMB2_PREAUTH_INTEGRITY_SHA512)

		return STATUS_NO_PREAUTH_INTEGRITY_HASH_OVERLAP;

		return STATUS_SMB_NO_PREAUTH_INTEGRITY_HASH_OVERLAP;



	conn->preauth_info->Preauth_HashId = SMB2_PREAUTH_INTEGRITY_SHA512;

	return STATUS_SUCCESS;