!18 [sync] PR-9: fix segmentation fault when using "dmraid -h" on aarch64

From: @openeuler-sync-bot 
Reviewed-by: @swf504 
Signed-off-by: @swf504
This commit is contained in:
openeuler-ci-bot 2024-03-30 01:09:30 +00:00 committed by Gitee
commit be196ff73c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 31 additions and 1 deletions

View File

@ -9,7 +9,7 @@
Summary: dmraid (Device-mapper RAID tool and library) Summary: dmraid (Device-mapper RAID tool and library)
Name: dmraid Name: dmraid
Version: 1.0.0.rc16 Version: 1.0.0.rc16
Release: 54 Release: 55
License: GPLv2+ License: GPLv2+
Group: System Environment/Base Group: System Environment/Base
URL: http://people.redhat.com/heinzm/sw/dmraid URL: http://people.redhat.com/heinzm/sw/dmraid
@ -48,6 +48,8 @@ Patch16: 0016-dmraid-fix-destdir.patch
Patch17: 0017-dmraid-fix-missing-destdir.patch Patch17: 0017-dmraid-fix-missing-destdir.patch
Patch18: 0018-dmraid-fix-so-flags.patch Patch18: 0018-dmraid-fix-so-flags.patch
Patch19: fix-segmentation-fault-when-using-dmraid-h-on-aarch64.patch
%description %description
DMRAID supports RAID device discovery, RAID set activation, creation, DMRAID supports RAID device discovery, RAID set activation, creation,
removal, rebuild and display of properties for ATARAID/DDF1 metadata on removal, rebuild and display of properties for ATARAID/DDF1 metadata on
@ -151,6 +153,9 @@ rm -rf $RPM_BUILD_ROOT
%ghost /var/cache/logwatch/dmeventd/syslogpattern.txt %ghost /var/cache/logwatch/dmeventd/syslogpattern.txt
%changelog %changelog
* Thu Sep 21 2023 shaoxuehua <shao_xuehua@hoperun.com> - 1.0.0.rc16-55
- fix segmentation fault when using "dmraid -h" on aarch64
* Tue Jun 29 2021 zhouwenpei <zhouwenpei1@huawei.com> - 1.0.0.rc16-54 * Tue Jun 29 2021 zhouwenpei <zhouwenpei1@huawei.com> - 1.0.0.rc16-54
- add buildrequire gcc. - add buildrequire gcc.

View File

@ -0,0 +1,25 @@
From 9dce5cd1afb90332b11b3185af9a3bf7c91ee64a Mon Sep 17 00:00:00 2001
From: shao_xuehua <shao_xuehua@hoperun.com>
Date: Thu, 21 Sep 2023 11:27:15 +0800
Subject: [PATCH] fix segmentation fault when using "dmraid -h" on aarch64
---
tools/commands.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/commands.c b/tools/commands.c
index a3c77d2..b746935 100644
--- a/tools/commands.c
+++ b/tools/commands.c
@@ -266,7 +266,7 @@ help(struct lib_context *lc, int arg)
"\t[--size [0-9]...[kKgG][bB]]\n"
"\t[--str[i[de]] [0-9]...[kK][bB]]\n"
"\t{--disk[s] \"device-path[, device-path...\"}\n", c);
- log_print(lc, "%s\t{-x|--remove RAID-set} \n");
+ log_print(lc, "%s\t{-x|--remove RAID-set} \n", c);
log_print(lc, "%s\t{-R|--rebuild} RAID-set [drive_name]\n"
"\t[-u|--update_defer]", c);
log_print(lc, "%s\t[{-f|--format FORMAT}]\n"
--
2.20.1