From aeb19022280495eb093bb882130950b0dfd646db Mon Sep 17 00:00:00 2001 From: chenjingwen Date: Tue, 21 Nov 2023 10:01:05 +0800 Subject: [PATCH] bugfix: fix power_of_2 bug backport a patch to fix power_of_2 bug Signed-off-by: chenjingwen --- Backport-service-fix-power_of_2-bug.patch | 28 +++++++++++++++++++++++ secDetector.spec | 6 ++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 Backport-service-fix-power_of_2-bug.patch diff --git a/Backport-service-fix-power_of_2-bug.patch b/Backport-service-fix-power_of_2-bug.patch new file mode 100644 index 0000000..182613d --- /dev/null +++ b/Backport-service-fix-power_of_2-bug.patch @@ -0,0 +1,28 @@ +From 2ddd09ee581829e482d55db70b0cc92724b23c8d Mon Sep 17 00:00:00 2001 +From: chenjingwen +Date: Mon, 20 Nov 2023 10:48:18 +0800 +Subject: [PATCH 2/2] service: fix power_of_2 bug + +fix a bug + +Signed-off-by: chenjingwen +--- + observer_agent/service/main.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/observer_agent/service/main.cpp b/observer_agent/service/main.cpp +index 940cf83..f177645 100644 +--- a/observer_agent/service/main.cpp ++++ b/observer_agent/service/main.cpp +@@ -51,7 +51,7 @@ static bool power_of_2(unsigned int num) + { + if (num == 0) + return false; +- if (num & (num - 1) != 0) ++ if ((num & (num - 1)) != 0) + return false; + return true; + } +-- +2.33.0 + diff --git a/secDetector.spec b/secDetector.spec index 19966b1..410b60f 100644 --- a/secDetector.spec +++ b/secDetector.spec @@ -5,7 +5,7 @@ Name : secDetector Summary : OS Security Intrusion Detection System Version : 1.0 -Release : 2 +Release : 3 License : GPL-2.0 Source0 : %{name}-v%{version}.tar.gz BuildRequires: kernel-devel kernel-headers @@ -16,6 +16,7 @@ Requires : kernel Requires : protobuf grpc libuuid libbpf Patch0001: 0001-fix-report-api-function.patch +Patch0002: Backport-service-fix-power_of_2-bug.patch %description OS Security Intrusion Detection System @@ -89,6 +90,9 @@ rm -rf %{buildroot} %attr(0644,root,root) /usr/include/secDetector/secDetector_topic.h %changelog +* Tue Nov 21 2023 chenjingwen6 1.0-3 +- add patch to fix power_of_2 bug + * Sun Nov 19 2023 hurricane618 1.0-2 - add fix patch