diff options
| author | Amar Tumballi <amarts@redhat.com> | 2018-08-28 00:01:26 +0530 |
|---|---|---|
| committer | Amar Tumballi <amarts@redhat.com> | 2018-08-31 01:26:06 +0000 |
| commit | d3b1456c52f7dc4f21cdae2855092fda6b96af4a (patch) | |
| tree | 3ccc6d7cac5c93bfcc3d67fdfd1effa853e13735 /glusterfsd | |
| parent | 6a2f83caad7ff882e3a8da5fdec4be8ceccbfdc2 (diff) | |
clang-scan: fix multiple issues
* Buffer overflow issue in glusterfsd
* Null argument passed to function expecting non-null (event-epoll)
* Make sure the op_ret value is set in macro (posix)
Updates: bz#1622665
Change-Id: I32b378fc40a5e3ee800c0dfbc13335d44c9db9ac
Signed-off-by: Amar Tumballi <amarts@redhat.com>
Diffstat (limited to 'glusterfsd')
| -rw-r--r-- | glusterfsd/src/glusterfsd.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c index c3fea207b6e..12f561eb689 100644 --- a/glusterfsd/src/glusterfsd.c +++ b/glusterfsd/src/glusterfsd.c @@ -2720,11 +2720,18 @@ main (int argc, char *argv[]) command line options. */ { int i = 0; - strcpy (cmdlinestr, argv[0]); - for (i = 1; i < argc; i++) { - strcat (cmdlinestr, " "); - strncat (cmdlinestr, argv[i], - (sizeof (cmdlinestr) - 1)); + int pos = 0; + int len = snprintf (cmdlinestr, sizeof (cmdlinestr), "%s", argv[0]); + for (i = 1; (i < argc) && (len > 0); i++) { + pos += len; + len = snprintf (cmdlinestr + pos, sizeof (cmdlinestr) - pos, " %s", + argv[i]); + if ((len <= 0) || (len >= (sizeof (cmdlinestr) - pos))) { + gf_msg ("glusterfs", GF_LOG_ERROR, 0, glusterfsd_msg_29, + "failed to create command line string"); + ret = -1; + goto out; + } } gf_msg (argv[0], GF_LOG_INFO, 0, glusterfsd_msg_30, "Started running %s version %s (args: %s)", |