From 15e51a44dbfe80f9e8bd48cf971c6804f92c2571 Mon Sep 17 00:00:00 2001 From: yangqise7en <877793735@qq.com> Date: Fri, 28 Jun 2024 06:27:40 +0000 Subject: [PATCH] fix encrypt key memcpy defense --- src/storage/blocksstable/ob_data_store_desc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/blocksstable/ob_data_store_desc.cpp b/src/storage/blocksstable/ob_data_store_desc.cpp index 66e6a0ccd7..4146ea6732 100644 --- a/src/storage/blocksstable/ob_data_store_desc.cpp +++ b/src/storage/blocksstable/ob_data_store_desc.cpp @@ -97,7 +97,7 @@ int ObStaticDataStoreDesc::init_encryption_info(const ObMergeSchema &merge_schem STORAGE_LOG(WARN, "fail to get encrypt id from table schema", K(ret), K(merge_schema)); } else if (merge_schema.need_encrypt() && merge_schema.get_encrypt_key_len() > 0) { const int64_t key_str_len = share::OB_MAX_TABLESPACE_ENCRYPT_KEY_LENGTH; - if (OB_UNLIKELY(merge_schema.get_encrypt_key_len() >= key_str_len)) { + if (OB_UNLIKELY(merge_schema.get_encrypt_key_len() > key_str_len)) { ret = OB_SIZE_OVERFLOW; STORAGE_LOG(WARN, "encrypt key length overflow", KR(ret), K(merge_schema.get_encrypt_key_len()), K(key_str_len));