diff --git a/fix-uint8-return-code-bug.patch b/fix-uint8-return-code-bug.patch new file mode 100644 index 0000000000000000000000000000000000000000..c9fe29b21149cba8213f5414fbd7c404d6307b4f --- /dev/null +++ b/fix-uint8-return-code-bug.patch @@ -0,0 +1,39 @@ +From fc63bca4b73b28f3d970f1dfa725f463489c662f Mon Sep 17 00:00:00 2001 +From: luckky +Date: Thu, 31 Oct 2024 22:01:28 +0800 +Subject: [PATCH] fix uint8 return code bug + +--- + src/c/hbm_online_repair/non-standard-hbm-repair.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/c/hbm_online_repair/non-standard-hbm-repair.c b/src/c/hbm_online_repair/non-standard-hbm-repair.c +index f26d8ae..1337a63 100644 +--- a/src/c/hbm_online_repair/non-standard-hbm-repair.c ++++ b/src/c/hbm_online_repair/non-standard-hbm-repair.c +@@ -399,7 +399,7 @@ static int get_hardware_corrupted_size() + return hardware_corrupted_size; + } + +-static uint8_t get_repair_failed_result_code(int ret) ++static int get_repair_failed_result_code(int ret) + { + if (ret == -ENOSPC) { + return REPAIR_FAILED_NO_RESOURCE; +@@ -577,11 +577,11 @@ static int hbmc_hbm_after_repair(bool is_acls, const int repair_ret, const unsig + } + } + +-static uint8_t hbmc_hbm_repair(const struct hisi_common_error_section *err, char *path) ++static int hbmc_hbm_repair(const struct hisi_common_error_section *err, char *path) + { + unsigned long long paddr; + int ret; +- uint8_t repair_result_code; ++ int repair_result_code; + bool is_acls; + + /* Both ACLS and SPPR only repair the first address */ +-- +2.43.0 + diff --git a/sysSentry.spec b/sysSentry.spec index ecbbc28b935b550d15075d6723bb2d77cc60fdf3..031ee6b8d5cb745135c744ecc549f7d34784062b 100644 --- a/sysSentry.spec +++ b/sysSentry.spec @@ -4,7 +4,7 @@ Summary: System Inspection Framework Name: sysSentry Version: 1.0.2 -Release: 17 +Release: 18 License: Mulan PSL v2 Group: System Environment/Daemons Source0: https://gitee.com/openeuler/sysSentry/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -28,6 +28,7 @@ Patch15: add-separator-to-err-info.patch Patch16: remove-threshold-max-cpu-cores.patch Patch17: add-hbm-online-repair.patch Patch18: fix-hbm-online-repair-notice-and-efi-create.patch +Patch19: fix-uint8-return-code-bug.patch BuildRequires: cmake gcc-c++ BuildRequires: python3 python3-setuptools @@ -217,6 +218,12 @@ rm -rf %{buildroot} %attr(0550,root,root) %{python3_sitelib}/syssentry/bmc_alarm.py %changelog +* Thu Oct 31 2024 luckky - 1.0.2-18 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fix uint8 return code bug + * Mon Oct 28 2024 luckky - 1.0.2-17 - Type:bugfix - CVE:NA