diff options
| author | Amar Tumballi <amarts@redhat.com> | 2018-11-01 07:25:25 +0530 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2018-11-05 18:50:59 +0000 |
| commit | 74e8328d3f6901d6ba38a313965fe910c8411324 (patch) | |
| tree | 4816063d412cf9e436da301fccf165485bf22e18 /libglusterfs/src/stack.c | |
| parent | 2effe3b0d3fa51fc627c970353de2e326bcf1ef2 (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#1644763
Change-Id: Ib547293f2d9eb618594cbff0df3b9c800e88bde4
Signed-off-by: Amar Tumballi <amarts@redhat.com>
Diffstat (limited to 'libglusterfs/src/stack.c')
| -rw-r--r-- | libglusterfs/src/stack.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libglusterfs/src/stack.c b/libglusterfs/src/stack.c index c8a3b792979..4b5d13c3fc8 100644 --- a/libglusterfs/src/stack.c +++ b/libglusterfs/src/stack.c @@ -148,7 +148,7 @@ gf_proc_dump_call_frame(call_frame_t *call_frame, const char *key_buf, ...) out: if (ret) { gf_proc_dump_write("Unable to dump the frame information", - "(Lock acquisition failed) %p", my_frame); + "(Lock acquisition failed)"); return; } } @@ -185,9 +185,9 @@ gf_proc_dump_call_stack(call_stack_t *call_stack, const char *key_buf, ...) gf_proc_dump_write("uid", "%d", call_stack->uid); gf_proc_dump_write("gid", "%d", call_stack->gid); gf_proc_dump_write("pid", "%d", call_stack->pid); - gf_proc_dump_write("unique", "%Ld", call_stack->unique); + gf_proc_dump_write("unique", "%" PRIu64, call_stack->unique); gf_proc_dump_write("lk-owner", "%s", lkowner_utoa(&call_stack->lk_owner)); - gf_proc_dump_write("ctime", "%lld.%" GF_PRI_SNSECONDS, + gf_proc_dump_write("ctime", "%" GF_PRI_SECOND ".%" GF_PRI_SNSECONDS, call_stack->tv.tv_sec, call_stack->tv.tv_nsec); if (call_stack->type == GF_OP_TYPE_FOP) @@ -224,7 +224,7 @@ gf_proc_dump_pending_frames(call_pool_t *call_pool) gf_proc_dump_add_section("global.callpool"); section_added = _gf_true; gf_proc_dump_write("callpool_address", "%p", call_pool); - gf_proc_dump_write("callpool.cnt", "%d", call_pool->cnt); + gf_proc_dump_write("callpool.cnt", "%" PRId64, call_pool->cnt); list_for_each_entry(trav, &call_pool->all_frames, all_frames) { |