dim/backport-fix-the-magic-number.patch
jinlun aec8f0106e backport some patches
(cherry picked from commit 6559117500303659f7a061847662458d4037a7da)
2024-04-17 14:20:30 +08:00

40 lines
1.2 KiB
Diff

From 1ca2bccf3608fafc95c32714127e8ff9c1fefbc4 Mon Sep 17 00:00:00 2001
From: Huaxin Lu <luhuaxin1@huawei.com>
Date: Thu, 16 Nov 2023 15:03:47 +0800
Subject: [PATCH 05/26] fix the magic number
---
src/core/dim_core_measure.h | 2 ++
src/core/dim_core_measure_kernel.c | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/core/dim_core_measure.h b/src/core/dim_core_measure.h
index c9abc4e..a379cf6 100644
--- a/src/core/dim_core_measure.h
+++ b/src/core/dim_core_measure.h
@@ -17,6 +17,8 @@
#define MEASURE_LOG_CAP_MAX (UINT_MAX)
#define MEASURE_LOG_CAP_MIN (100)
#define MEASURE_SCHEDULE_MAX (1000)
+/* max size of x86 */
+#define DIM_JUMP_LABEL_NOP_SIZE_MAX 5
struct vm_text_area {
struct mm_struct *mm;
diff --git a/src/core/dim_core_measure_kernel.c b/src/core/dim_core_measure_kernel.c
index faaf59c..135899d 100644
--- a/src/core/dim_core_measure_kernel.c
+++ b/src/core/dim_core_measure_kernel.c
@@ -78,7 +78,7 @@ static int do_calc_kernel_digest(uintptr_t saddr,
#ifdef JUMP_LABEL_NOP_SIZE
cur_addr = jump_code + JUMP_LABEL_NOP_SIZE;
#else
- cur_addr = jump_code + 5; // TODO
+ cur_addr = jump_code + DIM_JUMP_LABEL_NOP_SIZE_MAX;
#endif
}
--
2.33.0