diff options
| author | Amar Tumballi <amarts@redhat.com> | 2018-11-06 22:47:41 +0530 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2018-11-09 14:03:02 +0000 |
| commit | 83304fedb464fe3f97db662ce3e07bd948b7b7d9 (patch) | |
| tree | e9bc09af05900b562a99bff6ff964ed19a9bf685 /xlators/protocol | |
| parent | 7136414bcc0426270f1df8720018af1b53fd228a (diff) | |
all: fix the format string exceptions
Currently, there are possibilities in few places, where a user-controlled
(like filename, program parameter etc) string can be passed as 'fmt' for
printf(), which can lead to segfault, if the user's string contains '%s',
'%d' in it.
While fixing it, makes sense to make the explicit check for such issues
across the codebase, by making the format call properly.
Fixes: CVE-2018-14661
Fixes: bz#1647666
Change-Id: Ib547293f2d9eb618594cbff0df3b9c800e88bde4
Signed-off-by: Amar Tumballi <amarts@redhat.com>
Diffstat (limited to 'xlators/protocol')
| -rw-r--r-- | xlators/protocol/client/src/client.c | 4 | ||||
| -rw-r--r-- | xlators/protocol/server/src/server.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c index ffb0a6df656..c5bf28dcfb6 100644 --- a/xlators/protocol/client/src/client.c +++ b/xlators/protocol/client/src/client.c @@ -2796,13 +2796,13 @@ client_priv_dump(xlator_t *this) gf_proc_dump_build_key(key_prefix, "xlator.protocol.client", "%s.priv", this->name); - gf_proc_dump_add_section(key_prefix); + gf_proc_dump_add_section("%s", key_prefix); pthread_spin_lock(&conf->fd_lock); list_for_each_entry(tmp, &conf->saved_fds, sfd_pos) { sprintf(key, "fd.%d.remote_fd", i); - gf_proc_dump_write(key, "%d", tmp->remote_fd); + gf_proc_dump_write(key, "%" PRId64, tmp->remote_fd); client_fd_lk_ctx_dump(this, tmp->lk_ctx, i); i++; } diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c index 38ee9c30d07..a8664d7871e 100644 --- a/xlators/protocol/server/src/server.c +++ b/xlators/protocol/server/src/server.c @@ -247,7 +247,7 @@ server_priv(xlator_t *this) return 0; gf_proc_dump_build_key(key, "xlator.protocol.server", "priv"); - gf_proc_dump_add_section(key); + gf_proc_dump_add_section("%s", key); ret = pthread_mutex_trylock(&conf->mutex); if (ret != 0) |