mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-02-16 02:50:49 +00:00
Code Issues Projects Releases Wiki Activity

opensaf: Fix warnings found with gcc8

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Khem Raj
2018-04-17 00:25:35 -07:00
committed by Armin Kuster
parent d7a27a13fb
commit b9fee699f3
4 changed files with 250 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
meta-networking/recipes-daemons/opensaf/opensaf/0001-Catch-std-ifstream-failure-by-reference.patch Normal file
View File

@@ -0,0 +1,69 @@
From 77d50b8d92ef1903cbc50d8f39e05fc828696bb9 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 16 Apr 2018 14:33:35 -0700
Subject: [PATCH 1/2] Catch std::ifstream::failure by reference
Fixes
error: catching polymorphic type 'class std::ios_base::failure' by value
[-Werror=catch-value=]
} catch (std::ofstream::failure) {
^~~~~~~
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/base/conf.cc | 4 ++--
src/dtm/dtmnd/dtm_main.cc | 2 +-
src/dtm/dtmnd/multicast.cc | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/base/conf.cc b/src/base/conf.cc
index d5755a1..4820357 100644
--- a/src/base/conf.cc
+++ b/src/base/conf.cc
@@ -189,7 +189,7 @@ std::string Conf::ReadFile(const std::string& path_name,
try {
str.open(path_name);
str >> contents;
- } catch (std::ifstream::failure) {
+ } catch (std::ifstream::failure& e) {
contents.clear();
}
return (str.fail() || contents.empty()) ? default_contents : contents;
@@ -203,7 +203,7 @@ void Conf::WriteFileAtomically(const std::string& path_name,
try {
str.open(tmp_file, std::ofstream::out | std::ofstream::trunc);
str << contents << std::endl;
- } catch (std::ofstream::failure) {
+ } catch (std::ofstream::failure& e) {
success = false;
}
str.close();
diff --git a/src/dtm/dtmnd/dtm_main.cc b/src/dtm/dtmnd/dtm_main.cc
index 3260a81..a55afac 100644
--- a/src/dtm/dtmnd/dtm_main.cc
+++ b/src/dtm/dtmnd/dtm_main.cc
@@ -359,7 +359,7 @@ void UpdateNodeIdFile(DTM_INTERNODE_CB *cb) {
try {
str.open(PKGLOCALSTATEDIR "/node_id", std::ofstream::out);
str << std::hex << node_id << std::endl;
- } catch (std::ofstream::failure) {
+ } catch (std::ofstream::failure& e) {
}
str.close();
}
diff --git a/src/dtm/dtmnd/multicast.cc b/src/dtm/dtmnd/multicast.cc
index bf67b9c..7232066 100644
--- a/src/dtm/dtmnd/multicast.cc
+++ b/src/dtm/dtmnd/multicast.cc
@@ -198,7 +198,7 @@ bool Multicast::GetPeersFromFile(const std::string &path_name) {
}
}
}
- } catch (std::ifstream::failure) {
+ } catch (std::ifstream::failure& e) {
LOG_ER("Caught std::ifstream::failure when reading file '%s', peers=%zu",
path_name.c_str(), static_cast<size_t>(peers_.size()));
peers_.clear();
--
2.17.0

75
meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-string-overflow-in-snprintf.patch Normal file
View File

@@ -0,0 +1,75 @@
From 8cf323a2d8e02ca0bd36deb38e613c6edac546ad Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 16 Apr 2018 18:29:17 -0700
Subject: [PATCH] Fix string overflow in snprintf
Fixes errors like
error: '%s' dir
ective output may be truncated writing up to 255 bytes into a region of size 32 [-Werror=forma
t-truncation=]
snprintf(reinterpret_cast<char *>(Healthy.key), sizeof(Healthy.key), "%s",
^~~~
hlth_str);
~~~~~~~~
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/log/logd/lgs_util.cc | 4 ++--
src/rde/rded/rde_amf.cc | 2 +-
src/smf/smfd/SmfUpgradeCampaign.cc | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/log/logd/lgs_util.cc b/src/log/logd/lgs_util.cc
index ac93d5a..cce80f3 100644
--- a/src/log/logd/lgs_util.cc
+++ b/src/log/logd/lgs_util.cc
@@ -200,12 +200,12 @@ char *lgs_get_time(time_t *time_in) {
stringSize = 5 * sizeof(char);
snprintf(srcString, (size_t)stringSize, "%d",
- (timeStampData->tm_year + START_YEAR));
+ (timeStampData->tm_year + START_YEAR) & 0x4dU);
strncpy(timeStampString, srcString, stringSize);
stringSize = 3 * sizeof(char);
- snprintf(srcString, (size_t)stringSize, "%02d", (timeStampData->tm_mon + 1));
+ snprintf(srcString, (size_t)stringSize, "%02d", (timeStampData->tm_mon + 1) & 0x2dU);
strncat(timeStampString, srcString, stringSize);
diff --git a/src/rde/rded/rde_amf.cc b/src/rde/rded/rde_amf.cc
index 81e521e..d53cc48 100644
--- a/src/rde/rded/rde_amf.cc
+++ b/src/rde/rded/rde_amf.cc
@@ -102,7 +102,7 @@ static uint32_t rde_amf_healthcheck_start(RDE_AMF_CB *rde_amf_cb) {
SaAmfHealthcheckKeyT Healthy;
SaNameT SaCompName;
char *phlth_ptr;
- char hlth_str[256];
+ char hlth_str[32];
TRACE_ENTER();
diff --git a/src/smf/smfd/SmfUpgradeCampaign.cc b/src/smf/smfd/SmfUpgradeCampaign.cc
index 45cdce8..6761bcf 100644
--- a/src/smf/smfd/SmfUpgradeCampaign.cc
+++ b/src/smf/smfd/SmfUpgradeCampaign.cc
@@ -447,7 +447,7 @@ SaAisErrorT SmfUpgradeCampaign::tooManyRestarts(bool *o_result) {
TRACE_ENTER();
SaAisErrorT rc = SA_AIS_OK;
SaImmAttrValuesT_2 **attributes;
- int curCnt = 0;
+ short int curCnt = 0;
/* Read the SmfCampRestartInfo object smfCampRestartCnt attr */
std::string obj = "smfRestartInfo=info," +
@@ -473,7 +473,7 @@ SaAisErrorT SmfUpgradeCampaign::tooManyRestarts(bool *o_result) {
attrsmfCampRestartCnt.setName("smfCampRestartCnt");
attrsmfCampRestartCnt.setType("SA_IMM_ATTR_SAUINT32T");
char buf[5];
- snprintf(buf, 4, "%d", curCnt);
+ snprintf(buf, 4, "%hd", curCnt);
attrsmfCampRestartCnt.addValue(buf);
imoCampRestartInfo.addValue(attrsmfCampRestartCnt);

102
meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-format-truncation-errors.patch Normal file
View File

@@ -0,0 +1,102 @@
From 4d58d26cbd3622183afc2e8f85c9c81edaf135df Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 16 Apr 2018 14:56:47 -0700
Subject: [PATCH 2/2] Fix format-truncation errors
Fixes errors with gcc8 eg.
error: '%u' directive output may be truncated writing between 1 and 10 bytes into a region of size between 0 and 254 [-Werror=format-truncation=]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/base/daemon.c | 4 ++--
src/mds/mds_c_db.c | 8 ++++----
src/mds/mds_core.h | 4 ++--
src/mds/mds_dt2c.h | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/base/daemon.c b/src/base/daemon.c
index 27170d7..da97700 100644
--- a/src/base/daemon.c
+++ b/src/base/daemon.c
@@ -92,11 +92,11 @@ static int __create_pidfile(const char *pidfile)
{
FILE *file = NULL;
int fd, rc = 0;
- char pidfiletmp[NAME_MAX] = {0};
+ char pidfiletmp[NAME_MAX+12] = {0};
pid_t pid;
pid = getpid();
- snprintf(pidfiletmp, NAME_MAX, "%s.%u.tmp", pidfile, pid);
+ snprintf(pidfiletmp, NAME_MAX+12, "%s.%u.tmp", pidfile, pid);
/* open the file and associate a stream with it */
if (((fd = open(pidfiletmp, O_RDWR | O_CREAT, 0644)) == -1) ||
diff --git a/src/mds/mds_c_db.c b/src/mds/mds_c_db.c
index e6b95cd..3d4a222 100644
--- a/src/mds/mds_c_db.c
+++ b/src/mds/mds_c_db.c
@@ -124,10 +124,10 @@ void get_adest_details(MDS_DEST adest, char *adest_details)
}
if (remote == true)
- snprintf(adest_details, MDS_MAX_PROCESS_NAME_LEN,
+ snprintf(adest_details, MDS_MAX_PROCESS_NAME_LEN+24,
"<rem_nodeid[0x%" PRIx32 "]:%s>", ncs_node_id, process_name);
else
- snprintf(adest_details, MDS_MAX_PROCESS_NAME_LEN,
+ snprintf(adest_details, MDS_MAX_PROCESS_NAME_LEN+24,
"<nodeid[0x%" PRIx32 "]:%s>", ncs_node_id, process_name);
m_MDS_LOG_DBG("MDS:DB: adest_details: %s ", adest_details);
@@ -207,10 +207,10 @@ void get_subtn_adest_details(MDS_PWE_HDL pwe_hdl, MDS_SVC_ID svc_id,
}
if (remote == true)
- snprintf(adest_details, MDS_MAX_PROCESS_NAME_LEN,
+ snprintf(adest_details, MDS_MAX_PROCESS_NAME_LEN+24,
"<rem_node[0x%" PRIx32 "]:%s>", ncs_node_id, process_name);
else
- snprintf(adest_details, MDS_MAX_PROCESS_NAME_LEN,
+ snprintf(adest_details, MDS_MAX_PROCESS_NAME_LEN+24,
"<node[0x%" PRIx32 "]:%s>", ncs_node_id, process_name);
done:
m_MDS_LOG_DBG("MDS:DB: adest_details: %s ", adest_details);
diff --git a/src/mds/mds_core.h b/src/mds/mds_core.h
index 37696d4..7f5225d 100644
--- a/src/mds/mds_core.h
+++ b/src/mds/mds_core.h
@@ -163,7 +163,7 @@ typedef struct mds_subscription_results_info {
uint32_t msg_snd_cnt; /* Message send count to this destination */
uint32_t msg_rcv_cnt; /* Message rcv count from this destination */
char sub_adest_details
- [MDS_MAX_PROCESS_NAME_LEN]; /* <node[slotno]:processname[pid]> */
+ [MDS_MAX_PROCESS_NAME_LEN+24]; /* <node[slotno]:processname[pid]> */
} MDS_SUBSCRIPTION_RESULTS_INFO;
@@ -194,7 +194,7 @@ typedef struct mds_subscription_info {
count is grater than ZERO bcast (multi-unicast) */
uint32_t prev_ver_sub_count;
char sub_adest_details
- [MDS_MAX_PROCESS_NAME_LEN]; /* <node[slotno]:processname[pid]> */
+ [MDS_MAX_PROCESS_NAME_LEN+24]; /* <node[slotno]:processname[pid]> */
} MDS_SUBSCRIPTION_INFO;
diff --git a/src/mds/mds_dt2c.h b/src/mds/mds_dt2c.h
index 012999c..006b722 100644
--- a/src/mds/mds_dt2c.h
+++ b/src/mds/mds_dt2c.h
@@ -143,7 +143,7 @@ typedef struct mdtm_send_req {
*/
MDS_DEST adest; /* MDTM to do local/remote routing, destination adest */
char sub_adest_details
- [MDS_MAX_PROCESS_NAME_LEN]; /* <node[nodeid]:processname[pid]> */
+ [MDS_MAX_PROCESS_NAME_LEN+24]; /* <node[nodeid]:processname[pid]> */
MDS_SEND_PRIORITY_TYPE pri;
MDS_CLIENT_MSG_FORMAT_VER
msg_fmt_ver; /* message format version specification */
--
2.17.0

5
meta-networking/recipes-daemons/opensaf/opensaf_5.18.02.bb
View File

@@ -24,7 +24,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \
file://0001-configure-Disable-format-overflow-if-supported-by-gc.patch \
file://0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch \
file://0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch \
"
file://0001-Catch-std-ifstream-failure-by-reference.patch \
file://0002-Fix-format-truncation-errors.patch \
file://0001-Fix-string-overflow-in-snprintf.patch \
"
SRC_URI[md5sum] = "42064f5ddbc7f560bfc5ff93ea9eecc7"
SRC_URI[sha256sum] = "f9e24897f9cfd63bb3115f6275c706de1702d3d9bae2fc423227db72b23c37f0"