summaryrefslogtreecommitdiffstats
path: root/xlators/performance/nl-cache/src/nl-cache-helper.c
diff options
context:
space:
mode:
authorAmar Tumballi <amarts@redhat.com>2018-11-01 07:25:25 +0530
committerShyamsundar Ranganathan <srangana@redhat.com>2018-11-05 18:50:59 +0000
commit74e8328d3f6901d6ba38a313965fe910c8411324 (patch)
tree4816063d412cf9e436da301fccf165485bf22e18 /xlators/performance/nl-cache/src/nl-cache-helper.c
parent2effe3b0d3fa51fc627c970353de2e326bcf1ef2 (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 'xlators/performance/nl-cache/src/nl-cache-helper.c')
-rw-r--r--xlators/performance/nl-cache/src/nl-cache-helper.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/xlators/performance/nl-cache/src/nl-cache-helper.c b/xlators/performance/nl-cache/src/nl-cache-helper.c
index f2954a83228..279c023a5b1 100644
--- a/xlators/performance/nl-cache/src/nl-cache-helper.c
+++ b/xlators/performance/nl-cache/src/nl-cache-helper.c
@@ -1161,7 +1161,7 @@ nlc_dump_inodectx(xlator_t *this, inode_t *inode)
if (!ret) {
gf_proc_dump_build_key(key_prefix, "xlator.performance.nl-cache",
"nlc_inode");
- gf_proc_dump_add_section(key_prefix);
+ gf_proc_dump_add_section("%s", key_prefix);
__inode_path(inode, NULL, &path);
if (path != NULL) {
@@ -1176,14 +1176,14 @@ nlc_dump_inodectx(xlator_t *this, inode_t *inode)
gf_proc_dump_write("state", "%" PRIu64, nlc_ctx->state);
gf_proc_dump_write("timer", "%p", nlc_ctx->timer);
- gf_proc_dump_write("cache-time", "%lld", nlc_ctx->cache_time);
+ gf_proc_dump_write("cache-time", "%" GF_PRI_TIME, nlc_ctx->cache_time);
gf_proc_dump_write("cache-size", "%zu", nlc_ctx->cache_size);
gf_proc_dump_write("refd-inodes", "%" PRIu64, nlc_ctx->refd_inodes);
if (IS_PE_VALID(nlc_ctx->state))
list_for_each_entry_safe(pe, tmp, &nlc_ctx->pe, list)
{
- gf_proc_dump_write("pe", "%p, %s", pe, pe->inode, pe->name);
+ gf_proc_dump_write("pe", "%p, %p, %s", pe, pe->inode, pe->name);
}
if (IS_NE_VALID(nlc_ctx->state))