rpms
/
libstoragemgmt
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the incorrect memset size. 

Signed-off-by: Gris Ge <fge@redhat.com>
This commit is contained in:
Gris Ge 2018-03-23 20:40:01 +08:00
parent 58e753eb76
commit 9b31b84727
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
0001-Fix-GCC-8-compile-warnings.patch
View File

@ -1,7 +1,7 @@
From 8002d52533cd493ea9cc6ce9591d896f085211ff Mon Sep 17 00:00:00 2001
From edbd5fed3cb5f4f48dcc7ee97f601d2ea3537911 Mon Sep 17 00:00:00 2001
From: Gris Ge <fge@redhat.com>
Date: Thu, 22 Mar 2018 22:40:49 +0800
Subject: [PATCH 1/2] Fix GCC 8 compile warnings.
Date: Fri, 23 Mar 2018 20:38:55 +0800
Subject: [PATCH 1/3] Fix GCC 8 compile warnings.
* Fix '-Werror=format-truncation' warning by increase the buffer size.
* Fix '-Werror=cast-function-type' warning by disable it for Python c
@ -20,7 +20,7 @@ Signed-off-by: Gris Ge <fge@redhat.com>
7 files changed, 33 insertions(+), 29 deletions(-)
diff --git a/c_binding/libsg.c b/c_binding/libsg.c
index 75ee39d3..4ba84409 100644
index 75ee39d3..46893695 100644
--- a/c_binding/libsg.c
+++ b/c_binding/libsg.c
@@ -367,8 +367,9 @@ static int _sg_io_open(char *err_msg, const char *disk_path, int *fd,
@ -47,7 +47,7 @@ index 75ee39d3..4ba84409 100644
assert(data != NULL);
- memset(sense_err_msg, 0, _LSM_ERR_MSG_LEN);
+ memset(sense_err_msg, 0, sizeof(sense_err_msg)/sizeof(char));
+ memset(sense_err_msg, 0, sizeof(sense_err_msg));
switch(page_code) {
case _SG_T10_SPC_VPD_ATA_INFO:
@ -102,7 +102,7 @@ index 75ee39d3..4ba84409 100644
assert(data != NULL);
- memset(sense_err_msg, 0, _LSM_ERR_MSG_LEN);
+ memset(sense_err_msg, 0, sizeof(sense_err_msg)/sizeof(char));
+ memset(sense_err_msg, 0, sizeof(sense_err_msg));
/* SPC-5 rev 07, Table 219 - RECEIVE DIAGNOSTIC RESULTS command */
cdb[0] = RECEIVE_DIAGNOSTIC; /* OPERATION CODE */
@ -119,7 +119,7 @@ index 75ee39d3..4ba84409 100644
assert(data_len > 0);
- memset(sense_err_msg, 0, _LSM_ERR_MSG_LEN);
+ memset(sense_err_msg, 0, sizeof(sense_err_msg)/sizeof(char));
+ memset(sense_err_msg, 0, sizeof(sense_err_msg));
/* SPC-5 rev 07, Table 219 - RECEIVE DIAGNOSTIC RESULTS command */
cdb[0] = SEND_DIAGNOSTIC; /* OPERATION CODE */
@ -137,7 +137,7 @@ index 75ee39d3..4ba84409 100644
assert(data != NULL);
- memset(sense_err_msg, 0, _LSM_ERR_MSG_LEN);
+ memset(sense_err_msg, 0, sizeof(sense_err_msg)/sizeof(char));
+ memset(sense_err_msg, 0, sizeof(sense_err_msg));
memset(data, 0, _SG_T10_SPC_MODE_SENSE_MAX_LEN);
/* SPC-5 Table 171 - MODE SENSE(10) command */
@ -155,7 +155,7 @@ index 75ee39d3..4ba84409 100644
assert(data != NULL);
- memset(sense_err_msg, 0, _LSM_ERR_MSG_LEN);
+ memset(sense_err_msg, 0, sizeof(sense_err_msg)/sizeof(char));
+ memset(sense_err_msg, 0, sizeof(sense_err_msg));
memset(cdb, 0, _T10_SPC_LOG_SENSE_CMD_LEN);
cdb[0] = LOG_SENSE;
@ -172,7 +172,7 @@ index 75ee39d3..4ba84409 100644
assert(returned_sense_data != NULL);
- memset(sense_err_msg, 0, _LSM_ERR_MSG_LEN);
+ memset(sense_err_msg, 0, sizeof(sense_err_msg)/sizeof(char));
+ memset(sense_err_msg, 0, sizeof(sense_err_msg));
memset(cdb, 0, _T10_SPC_REQUEST_SENSE_CMD_LEN);
cdb[0] = REQUEST_SENSE;

4
0002-lsmd-Fix-crash-when-plugin-named-as-_lsmplugin.patch
View File

@ -1,7 +1,7 @@
From c24b5d5c66083f26cd4e1181e6497953d6675bdc Mon Sep 17 00:00:00 2001
From 8bbfe53b464c652a0bdeb8b9790e787276d1a2d6 Mon Sep 17 00:00:00 2001
From: Gris Ge <fge@redhat.com>
Date: Thu, 22 Mar 2018 22:56:37 +0800
Subject: [PATCH 2/2] lsmd: Fix crash when plugin named as _lsmplugin.
Subject: [PATCH 2/3] lsmd: Fix crash when plugin named as _lsmplugin.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

5
libstoragemgmt.spec
View File

@ -3,7 +3,7 @@
Name: libstoragemgmt
Version: 1.6.1
Release: 6%{?dist}
Release: 7%{?dist}
Summary: Storage array management library
Group: System Environment/Libraries
License: LGPLv2+
@ -648,6 +648,9 @@ fi
%{_mandir}/man1/local_lsmplugin.1*
%changelog
* Fri Mar 23 2018 Gris Ge <fge@redhat.com> - 1.6.1-7
- Fix incorect memset size.
* Fri Mar 23 2018 Gris Ge <fge@redhat.com> - 1.6.1-6
- Add ./autogen.sh back to fix the version diff on autotools.