mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

opensaf: update to 5.19.03

Browse Source 
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Oleksandr Kravchuk
2019-05-19 22:12:33 +02:00
committed by Khem Raj
parent 74aeba20e5
commit 7ada285f29
5 changed files with 2 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-daemons/opensaf/opensaf/0001-Catch-std-ifstream-failure-by-reference.patch
-67
View File
@@ -1,67 +0,0 @@
From 38c5343f84799fc5041575f3ec808f7476b6eea3 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] 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 585e11e..5cf6ad7 100644
--- a/src/dtm/dtmnd/dtm_main.cc
+++ b/src/dtm/dtmnd/dtm_main.cc
@@ -367,7 +367,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 cadc002..7c25fea 100644
--- a/src/dtm/dtmnd/multicast.cc
+++ b/src/dtm/dtmnd/multicast.cc
@@ -199,7 +199,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();
meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-string-overflow-in-snprintf.patch
-76
View File
@@ -1,76 +0,0 @@
From 88661a60629894353512c53ed32f2b901f64149c 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 c30ea14..098f17a 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.SetAttributeName("smfCampRestartCnt");
attrsmfCampRestartCnt.SetAttributeType("SA_IMM_ATTR_SAUINT32T");
char buf[5];
- snprintf(buf, 4, "%d", curCnt);
+ snprintf(buf, 4, "%hd", curCnt);
attrsmfCampRestartCnt.AddAttributeValue(buf);
imoCampRestartInfo.AddValue(attrsmfCampRestartCnt);
meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-format-truncation-errors.patch
-100
View File
@@ -1,100 +0,0 @@
From c5034fe42df8923bcefc10e163151997d70b6241 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] 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 361dd8d..4001b73 100644
--- a/src/base/daemon.c
+++ b/src/base/daemon.c
@@ -95,11 +95,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 */
meta-networking/recipes-daemons/opensaf/opensaf/0008-check-for-size-before-using-strncpy.patch
-33
View File
@@ -1,33 +0,0 @@
From 29510dd81e3a5e96151afdb0702863cbfd640766 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 22 Jun 2018 18:58:59 -0700
Subject: [PATCH] check for size before using strncpy
ensures that size is never execeding the string length
that execPath can hold
Fixes
error: '__builtin___strncpy_chk' specified size between 18446744071562067968 and 18446744073709551615 exceeds maximum object size 9223372036854775807 [-Werror=stringop-overflow=]
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/imm/immnd/immnd_proc.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/imm/immnd/immnd_proc.c b/src/imm/immnd/immnd_proc.c
index 015932a..c8f115e 100644
--- a/src/imm/immnd/immnd_proc.c
+++ b/src/imm/immnd/immnd_proc.c
@@ -1902,6 +1902,10 @@ static int immnd_forkPbe(IMMND_CB *cb)
LOG_ER("Pathname too long: %u max is 1023", newLen);
return -1;
}
+ if (execDirLen > 1023 || execDirLen < 0) {
+ LOG_ER("Execdir name too long: %u max is 1023", execDirLen);
+ return -1;
+ }
strncpy(execPath, cb->mProgName, execDirLen);
execPath[execDirLen] = 0;
meta-networking/recipes-daemons/opensaf/opensaf_5.19.01.bb → meta-networking/recipes-daemons/opensaf/opensaf_5.19.03.bb
+2 -6
View File
@@ -24,13 +24,9 @@ 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 \
file://0008-check-for-size-before-using-strncpy.patch \
"
SRC_URI[md5sum] = "d9f44f778e23cf739085f74c5ff793b1"
SRC_URI[sha256sum] = "5713fbe21c557c9a992af6805bc44521f2cf6cf950ae873036d9a81c73364b60"
SRC_URI[md5sum] = "4dd1497ccd82d275735853bf0db5c510"
SRC_URI[sha256sum] = "de42c8dd850990716ca494ca598165cc7a23b5b7f2bc21af5d71a3d971ddd595"
inherit autotools useradd systemd pkgconfig