packages/freeipmi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!11 ipmi-config: fix output corner case due to missing error handling

Browse Source 
From: @chenmaodong 
Reviewed-by: @Charlie_li 
Signed-off-by: @Charlie_li
This commit is contained in:
openeuler-ci-bot 2022-12-29 08:53:23 +00:00 committed by Gitee
commit 1ccece7e71
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 61 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
backport-0001-ipmi-config-fix-output-corner-case-due-to-missing-er.patch Normal file
View File

@ -0,0 +1,55 @@
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

7
freeipmi.spec
View File

@ -1,6 +1,6 @@
Name: freeipmi Name: freeipmi
Version: 1.6.8 Version: 1.6.8
Release: 1 Release: 2
Summary: IPMI remote console and system management software Summary: IPMI remote console and system management software
License: GPLv3+ License: GPLv3+
URL: http://www.gnu.org/software/freeipmi/ URL: http://www.gnu.org/software/freeipmi/
@ -8,6 +8,8 @@ Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
Source1: bmc-watchdog.service Source1: bmc-watchdog.service
Source2: ipmidetectd.service Source2: ipmidetectd.service
Source3: ipmiseld.service Source3: ipmiseld.service
Patch0: backport-0001-ipmi-config-fix-output-corner-case-due-to-missing-er.patch
BuildRequires: libgcrypt-devel texinfo systemd gcc BuildRequires: libgcrypt-devel texinfo systemd gcc
%{?systemd_requires} %{?systemd_requires}
@ -136,6 +138,9 @@ install-info %{_infodir}/freeipmi-faq.info.gz %{_infodir}/dir &>/dev/null || :
%exclude %{_infodir}/dir %exclude %{_infodir}/dir
%changelog %changelog
* 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 * Fri Jan 14 2022 caodongxia <caodongxia@huawei.com> - 1.6.8-1
- Upgrade 1.6.8 - Upgrade 1.6.8