Compare commits

..

No commits in common. "bb788ee0f4488f7e091f1623b1ab1b55245403bc" and "d7d9e1881249cbb1cf60008c8bf65da0a1670638" have entirely different histories.

6 changed files with 3 additions and 128 deletions

View File

@ -1,25 +0,0 @@
From bd891f8dfaf8ccd0d90d385f50885f0e03f3ba48 Mon Sep 17 00:00:00 2001
From: wang--ge <wang__ge@126.com>
Date: Tue, 21 Mar 2023 16:58:07 +0800
Subject: [PATCH] fix illegal memory access
---
ipmiseld/ipmiseld-cache.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ipmiseld/ipmiseld-cache.c b/ipmiseld/ipmiseld-cache.c
index bad1d7a..317cb83 100644
--- a/ipmiseld/ipmiseld-cache.c
+++ b/ipmiseld/ipmiseld-cache.c
@@ -245,7 +245,7 @@ ipmiseld_sdr_cache_create_and_load (ipmiseld_host_data_t *host_data)
cleanup:
if (strlen (filename))
ipmi_sdr_cache_delete (host_data->host_poll->sdr_ctx, filename);
- ipmi_sdr_ctx_destroy (host_data->host_poll->sdr_ctx);
+ //ipmi_sdr_ctx_destroy (host_data->host_poll->sdr_ctx);
return (-1);
}
--
2.27.0

View File

@ -1,55 +0,0 @@
From 45817796f6a1825c0cfb565c3e1625f83d6447cd Mon Sep 17 00:00:00 2001
From: Albert Chu <chu11@llnl.gov>
Date: Fri, 28 Jan 2022 14:49:12 -0800
Subject: [PATCH] ipmi-config: fix output corner case due to missing error
handling
---
...i-config-category-core-lan6-conf-section.c | 22 ++++++++++---------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/ipmi-config/ipmi-config-category-core-lan6-conf-section.c b/ipmi-config/ipmi-config-category-core-lan6-conf-section.c
index e82ca1c74..6d5e2943b 100644
--- a/ipmi-config/ipmi-config-category-core-lan6-conf-section.c
+++ b/ipmi-config/ipmi-config-category-core-lan6-conf-section.c
@@ -1800,18 +1800,18 @@ ipv6_static_router_mac_address_checkout (ipmi_config_state_data_t *state_data,
if (num == 1)
tmp = ipmi_cmd_get_lan_configuration_parameters_ipv6_static_router_1_mac_address (state_data->ipmi_ctx,
- channel_number,
- IPMI_GET_LAN_PARAMETER,
- IPMI_LAN_CONFIGURATION_PARAMETERS_NO_SET_SELECTOR,
- IPMI_LAN_CONFIGURATION_PARAMETERS_NO_BLOCK_SELECTOR,
- obj_cmd_rs);
+ channel_number,
+ IPMI_GET_LAN_PARAMETER,
+ IPMI_LAN_CONFIGURATION_PARAMETERS_NO_SET_SELECTOR,
+ IPMI_LAN_CONFIGURATION_PARAMETERS_NO_BLOCK_SELECTOR,
+ obj_cmd_rs);
else
tmp = ipmi_cmd_get_lan_configuration_parameters_ipv6_static_router_2_mac_address (state_data->ipmi_ctx,
- channel_number,
- IPMI_GET_LAN_PARAMETER,
- IPMI_LAN_CONFIGURATION_PARAMETERS_NO_SET_SELECTOR,
- IPMI_LAN_CONFIGURATION_PARAMETERS_NO_BLOCK_SELECTOR,
- obj_cmd_rs);
+ channel_number,
+ IPMI_GET_LAN_PARAMETER,
+ IPMI_LAN_CONFIGURATION_PARAMETERS_NO_SET_SELECTOR,
+ IPMI_LAN_CONFIGURATION_PARAMETERS_NO_BLOCK_SELECTOR,
+ obj_cmd_rs);
if (tmp < 0)
{
@@ -2031,6 +2031,8 @@ ipv6_static_router_prefix_length_checkout (ipmi_config_state_data_t *state_data,
kv,
prefix_length) < 0)
+ return (IPMI_CONFIG_ERR_FATAL_ERROR);
+
rv = IPMI_CONFIG_ERR_SUCCESS;
cleanup:
fiid_obj_destroy (obj_cmd_rs);
--
2.21.0

View File

@ -1,25 +0,0 @@
From 79553b7b68f2f3b618234b9528f358952ebe61b2 Mon Sep 17 00:00:00 2001
From: Albert Chu <chu11@llnl.gov>
Date: Fri, 28 Jan 2022 14:58:34 -0800
Subject: [PATCH] libfreeipmi/cmds: fix invalid template check error
---
libfreeipmi/cmds/ipmi-lan-cmds.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libfreeipmi/cmds/ipmi-lan-cmds.c b/libfreeipmi/cmds/ipmi-lan-cmds.c
index 959548ca6..365e1771c 100644
--- a/libfreeipmi/cmds/ipmi-lan-cmds.c
+++ b/libfreeipmi/cmds/ipmi-lan-cmds.c
@@ -2324,7 +2324,7 @@ fill_cmd_set_lan_configuration_parameters_ipv6_static_addresses (uint8_t channel
return (-1);
}
- if (FIID_OBJ_TEMPLATE_COMPARE (obj_cmd_rq, tmpl_cmd_set_lan_configuration_parameters_ipv6_header_flow_label_rq) < 0)
+ if (FIID_OBJ_TEMPLATE_COMPARE (obj_cmd_rq, tmpl_cmd_set_lan_configuration_parameters_ipv6_static_addresses_rq) < 0)
{
ERRNO_TRACE (errno);
return (-1);
--
2.21.0

BIN
freeipmi-1.6.2.tar.gz Normal file

Binary file not shown.

Binary file not shown.

View File

@ -1,5 +1,5 @@
Name: freeipmi
Version: 1.6.8
Version: 1.6.2
Release: 4
Summary: IPMI remote console and system management software
License: GPLv3+
@ -8,11 +8,7 @@ Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
Source1: bmc-watchdog.service
Source2: ipmidetectd.service
Source3: ipmiseld.service
Patch0: backport-0001-ipmi-config-fix-output-corner-case-due-to-missing-er.patch
Patch1: backport-0001-libfreeipmi-cmds-fix-invalid-template-check-error.patch
Patch2: 0001-fix-illegal-memory-access.patch
BuildRequires: libgcrypt-devel texinfo systemd gcc
BuildRequires: libgcrypt-devel texinfo systemd
%{?systemd_requires}
Requires(post): ldconfig
@ -140,24 +136,8 @@ install-info %{_infodir}/freeipmi-faq.info.gz %{_infodir}/dir &>/dev/null || :
%exclude %{_infodir}/dir
%changelog
* Wed Mar 22 2023 Ge Wang <wangge20@h-partners.com> - 1.6.8-4
- fix illegal memory access
* Thu Jan 05 2023 chenmaodong <chenmaodong@xfusion.com> - 1.6.8-3
- fix invalid template check error
* Thu Dec 29 2022 chenmaodong <chenmaodong@xfusion.com> - 1.6.8-2
- ipmi-config: fix output corner case due to missing error handling
* Fri Jan 14 2022 caodongxia <caodongxia@huawei.com> - 1.6.8-1
- Upgrade 1.6.8
* Wed Jun 2 2021 baizhonggui <baizhonggui@huawei.com> - 1.6.2-5
- Fix building error: configure: error: no acceptable C compiler found in $PATH
- Add gcc in BuildRequires
* Sat Nov 30 2019 wangye<wangye54@huawei.com> - 1.6.2-4
- Package init
* Thu Nov 21 2019 wangye<wangye54@huawei.com> - 1.6.2-3
- Package init
- Package init