You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2017/03/08 19:17:16 UTC
[1/3] incubator-trafodion git commit: As debugged by Arvind: Increase
size of the buffer that reads cmdline arg
Repository: incubator-trafodion
Updated Branches:
refs/heads/release2.1 74a86b9c2 -> 4e8dd59b0
As debugged by Arvind: Increase size of the buffer that reads cmdline arg
Conflicts:
core/sql/cli/CliExtern.cpp
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d7c8adfa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d7c8adfa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d7c8adfa
Branch: refs/heads/release2.1
Commit: d7c8adfaa3fde527f586bd826c2cd438e19174ee
Parents: 3eddda4
Author: kevinxu021 <ka...@esgyn.cn>
Authored: Tue Mar 7 10:24:35 2017 +0000
Committer: kevinxu021 <ka...@esgyn.cn>
Committed: Tue Mar 7 10:24:35 2017 +0000
----------------------------------------------------------------------
core/sql/cli/CliExtern.cpp | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d7c8adfa/core/sql/cli/CliExtern.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/CliExtern.cpp b/core/sql/cli/CliExtern.cpp
index 95ed04b..acbbe7b 100644
--- a/core/sql/cli/CliExtern.cpp
+++ b/core/sql/cli/CliExtern.cpp
@@ -853,6 +853,7 @@ short my_mpi_setup (Int32* argc, char** argv[] );
#endif
};
+#define MY_ARG_MAX 2097152
short sqInit()
{
@@ -860,17 +861,28 @@ short sqInit()
if (!sbInitialized) {
sbInitialized = true;
-
Int32 largc = 0;
char **largv = 0;
char procFileName[128];
FILE *proc_file = 0;
- char buf[8193];
- short p_i = 0;
+ char *buf = 0;
+ int p_i = 0;
Int32 c = 0;
+ long lv_arg_max = sysconf(_SC_ARG_MAX);
+ if ((errno == EINVAL) || // In the remote chance that sysconf returns an error
+ (lv_arg_max < 0) || // just some sanity check
+ (lv_arg_max > MY_ARG_MAX)) {
+ lv_arg_max = MY_ARG_MAX;
+ }
+
+ buf = (char *) malloc ((lv_arg_max+1) * sizeof(char));
+ if (buf == NULL) {
+ cerr << "sqInit: Error while allocatting memory for " << getpid() <<". Exiting..." << endl;
+ exit(1);
+ }
// This memory is never freed.
- largv = (char **) malloc(100 * sizeof(char *));
+ largv = (char **) malloc(512 * sizeof(char *));
sprintf(procFileName, "/proc/%d/cmdline",getpid());
proc_file = fopen(procFileName, "r");
@@ -878,7 +890,7 @@ short sqInit()
buf[0] = 0; p_i = 0;
while ((c = fgetc(proc_file)) != EOF) {
buf[p_i++] = c;
- if (p_i >= sizeof(buf))
+ if (p_i >= lv_arg_max)
abort();
if (c == 0) {
// This memory is never freed.
@@ -889,6 +901,7 @@ short sqInit()
}
}
+ free(buf);
fclose(proc_file);
try
[3/3] incubator-trafodion git commit: Merge [TRAFODION-2524] Increase
cmdline buffer size
Posted by db...@apache.org.
Merge [TRAFODION-2524] Increase cmdline buffer size
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/4e8dd59b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/4e8dd59b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/4e8dd59b
Branch: refs/heads/release2.1
Commit: 4e8dd59b0f66e9c604a661c529b0bbce36c3775f
Parents: 74a86b9 8a3cfd6
Author: Dave Birdsall <db...@apache.org>
Authored: Wed Mar 8 19:16:12 2017 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Wed Mar 8 19:16:12 2017 +0000
----------------------------------------------------------------------
core/sqf/src/seabed/src/ms.cpp | 2 ++
core/sql/cli/CliExtern.cpp | 23 ++++++++++++++++++-----
2 files changed, 20 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-trafodion git commit: Handle unsafe sprintf call
causing DCS Master to core on Centos 7.x
Posted by db...@apache.org.
Handle unsafe sprintf call causing DCS Master to core on Centos 7.x
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/8a3cfd6f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/8a3cfd6f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/8a3cfd6f
Branch: refs/heads/release2.1
Commit: 8a3cfd6fecdc86ed59e6968dcfab6398398f316a
Parents: d7c8adf
Author: Arvind Narain <ar...@esgyn.com>
Authored: Sat Aug 6 01:09:01 2016 +0000
Committer: kevinxu021 <ka...@esgyn.cn>
Committed: Wed Mar 8 01:18:12 2017 +0000
----------------------------------------------------------------------
core/sqf/src/seabed/src/ms.cpp | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8a3cfd6f/core/sqf/src/seabed/src/ms.cpp
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/src/ms.cpp b/core/sqf/src/seabed/src/ms.cpp
index 3984fad..f887547 100644
--- a/core/sqf/src/seabed/src/ms.cpp
+++ b/core/sqf/src/seabed/src/ms.cpp
@@ -1391,6 +1391,7 @@ SB_THROWS_FATAL {
true, // args
&lv_cmdline,
lv_cmdline.size());
+#if 0
#ifdef SQ_PHANDLE_VERIFIER
sprintf(&lv_line, "msg_init - p-id=%d/%d" PFVY ", tid=%ld, pname=%s, cmdline=%s, %s\n",
#else
@@ -1405,6 +1406,7 @@ SB_THROWS_FATAL {
ga_ms_su_pname,
&lv_cmdline,
ms_seabed_vers());
+#endif
// setup timer module
sb_timer_init();