diff --git a/fix-xalarm-not-reject-alarm-msg-exceeds-max-length.patch b/fix-xalarm-not-reject-alarm-msg-exceeds-max-length.patch new file mode 100644 index 0000000000000000000000000000000000000000..07ae6d501bb7bfe20a9fc45d341ef009554f3f3b --- /dev/null +++ b/fix-xalarm-not-reject-alarm-msg-exceeds-max-length.patch @@ -0,0 +1,29 @@ +From 91110be161465814c44fea6f3e3280f8648df597 Mon Sep 17 00:00:00 2001 +From: caixiaomeng +Date: Thu, 7 Nov 2024 11:44:26 +0800 +Subject: [PATCH] fix xalarm not reject alarm msg exceeds max length + +--- + src/libso/xalarm/register_xalarm.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/libso/xalarm/register_xalarm.c b/src/libso/xalarm/register_xalarm.c +index fe15dc8..1e05c6b 100644 +--- a/src/libso/xalarm/register_xalarm.c ++++ b/src/libso/xalarm/register_xalarm.c +@@ -353,6 +353,11 @@ int xalarm_Report(unsigned short usAlarmId, unsigned char ucAlarmLevel, + return -1; + } + ++ if (pucParas == NULL || (int)strlen(pucParas) > MAX_PARAS_LEN) { ++ fprintf(stderr, "%s: alarm info invalid\n", __func__); ++ return -1; ++ } ++ + if (memset(&info, 0, sizeof(struct alarm_info)) == NULL) { + fprintf(stderr, "%s: memset info failed, ret: %d\n", __func__, ret); + return -1; +-- +2.33.0 + + diff --git a/sysSentry.spec b/sysSentry.spec index 66b8b315e208cb7f479bb181f5947521a2cecdd4..3809f26e0d947b7a7663ec7e80d09d87ccc034f2 100644 --- a/sysSentry.spec +++ b/sysSentry.spec @@ -4,13 +4,14 @@ Summary: System Inspection Framework Name: sysSentry Version: 1.0.2 -Release: 1 +Release: 2 License: Mulan PSL v2 Group: System Environment/Daemons Source0: https://gitee.com/openeuler/sysSentry/releases/download/v%{version}/%{name}-%{version}.tar.gz BuildRoot: %{_builddir}/%{name}-root Patch1: fix-version-in-setup.py.patch +Patch2: fix-xalarm-not-reject-alarm-msg-exceeds-max-length.patch BuildRequires: cmake gcc-c++ BuildRequires: python3 python3-setuptools @@ -164,6 +165,12 @@ rm -rf %{buildroot} %attr(0550,root,root) %{python3_sitelib}/syssentry/cpu_* %changelog +* Thu Nov 7 2024 caixiaomeng - 1.0.2-2 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fix xalarm not reject alarm msg exceeds max length + * Tue Jun 11 2024 shixuantong - 1.0.2-1 - Type:enhancement - CVE:NA