From 74e8328d3f6901d6ba38a313965fe910c8411324 Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Thu, 1 Nov 2018 07:25:25 +0530 Subject: 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 --- xlators/cluster/afr/src/afr-common.c | 4 ++-- xlators/cluster/dht/src/dht-shared.c | 2 +- xlators/cluster/ec/src/ec.c | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'xlators/cluster') diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c index 3a62df34aef..c27159a07af 100644 --- a/xlators/cluster/afr/src/afr-common.c +++ b/xlators/cluster/afr/src/afr-common.c @@ -4860,7 +4860,7 @@ afr_priv_dump(xlator_t *this) GF_ASSERT(priv); snprintf(key_prefix, GF_DUMP_MAX_BUF_LEN, "%s.%s", this->type, this->name); - gf_proc_dump_add_section(key_prefix); + gf_proc_dump_add_section("%s", key_prefix); gf_proc_dump_write("child_count", "%u", priv->child_count); for (i = 0; i < priv->child_count; i++) { sprintf(key, "child_up[%d]", i); @@ -4897,7 +4897,7 @@ afr_priv_dump(xlator_t *this) gf_proc_dump_write("ta_child_up", "%d", priv->ta_child_up); gf_proc_dump_write("ta_bad_child_index", "%d", priv->ta_bad_child_index); - gf_proc_dump_write("ta_notify_dom_lock_offset", "%lld", + gf_proc_dump_write("ta_notify_dom_lock_offset", "%" PRId64, priv->ta_notify_dom_lock_offset); } diff --git a/xlators/cluster/dht/src/dht-shared.c b/xlators/cluster/dht/src/dht-shared.c index 8cccbc86f0f..0a7aa15e242 100644 --- a/xlators/cluster/dht/src/dht-shared.c +++ b/xlators/cluster/dht/src/dht-shared.c @@ -158,7 +158,7 @@ dht_priv_dump(xlator_t *this) gf_proc_dump_write(key, "%lf", conf->du_stats[i].avail_inodes); snprintf(key, sizeof(key), "du_stats[%d].log", i); - gf_proc_dump_write(key, "%lu", conf->du_stats[i].log); + gf_proc_dump_write(key, "%" PRIu32, conf->du_stats[i].log); } } diff --git a/xlators/cluster/ec/src/ec.c b/xlators/cluster/ec/src/ec.c index 00c374e7ca3..b56dd9ada3e 100644 --- a/xlators/cluster/ec/src/ec.c +++ b/xlators/cluster/ec/src/ec.c @@ -1380,7 +1380,7 @@ ec_dump_private(xlator_t *this) GF_ASSERT(ec); snprintf(key_prefix, GF_DUMP_MAX_BUF_LEN, "%s.%s", this->type, this->name); - gf_proc_dump_add_section(key_prefix); + gf_proc_dump_add_section("%s", key_prefix); gf_proc_dump_write("up", "%u", ec->up); gf_proc_dump_write("nodes", "%u", ec->nodes); gf_proc_dump_write("redundancy", "%u", ec->redundancy); @@ -1400,21 +1400,21 @@ ec_dump_private(xlator_t *this) snprintf(key_prefix, GF_DUMP_MAX_BUF_LEN, "%s.%s.stats.stripe_cache", this->type, this->name); - gf_proc_dump_add_section(key_prefix); + gf_proc_dump_add_section("%s", key_prefix); - gf_proc_dump_write("hits", "%llu", + gf_proc_dump_write("hits", "%" GF_PRI_ATOMIC, GF_ATOMIC_GET(ec->stats.stripe_cache.hits)); - gf_proc_dump_write("misses", "%llu", + gf_proc_dump_write("misses", "%" GF_PRI_ATOMIC, GF_ATOMIC_GET(ec->stats.stripe_cache.misses)); - gf_proc_dump_write("updates", "%llu", + gf_proc_dump_write("updates", "%" GF_PRI_ATOMIC, GF_ATOMIC_GET(ec->stats.stripe_cache.updates)); - gf_proc_dump_write("invalidations", "%llu", + gf_proc_dump_write("invalidations", "%" GF_PRI_ATOMIC, GF_ATOMIC_GET(ec->stats.stripe_cache.invals)); - gf_proc_dump_write("evicts", "%llu", + gf_proc_dump_write("evicts", "%" GF_PRI_ATOMIC, GF_ATOMIC_GET(ec->stats.stripe_cache.evicts)); - gf_proc_dump_write("allocations", "%llu", + gf_proc_dump_write("allocations", "%" GF_PRI_ATOMIC, GF_ATOMIC_GET(ec->stats.stripe_cache.allocs)); - gf_proc_dump_write("errors", "%llu", + gf_proc_dump_write("errors", "%" GF_PRI_ATOMIC, GF_ATOMIC_GET(ec->stats.stripe_cache.errors)); return 0; -- cgit