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/features/locks/src/posix.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'xlators/features/locks') diff --git a/xlators/features/locks/src/posix.c b/xlators/features/locks/src/posix.c index f08a22d4fc3..17f733a720e 100644 --- a/xlators/features/locks/src/posix.c +++ b/xlators/features/locks/src/posix.c @@ -3224,7 +3224,7 @@ __dump_entrylks(pl_inode_t *pl_inode) lock->connection_id, blocked, granted); } - gf_proc_dump_write(key, tmp); + gf_proc_dump_write(key, "%s", tmp); count++; } @@ -3242,7 +3242,7 @@ __dump_entrylks(pl_inode_t *pl_inode) lkowner_utoa(&lock->owner), lock->client, lock->connection_id, blocked); - gf_proc_dump_write(key, tmp); + gf_proc_dump_write(key, "%s", tmp); count++; } @@ -3286,7 +3286,7 @@ __dump_inodelks(pl_inode_t *pl_inode) lock->client, lock->connection_id, &lock->granted_time.tv_sec, &lock->blkd_time.tv_sec, _gf_true); - gf_proc_dump_write(key, tmp); + gf_proc_dump_write(key, "%s", tmp); count++; } @@ -3299,7 +3299,7 @@ __dump_inodelks(pl_inode_t *pl_inode) pl_dump_lock(tmp, sizeof(tmp), &lock->user_flock, &lock->owner, lock->client, lock->connection_id, 0, &lock->blkd_time.tv_sec, _gf_false); - gf_proc_dump_write(key, tmp); + gf_proc_dump_write(key, "%s", tmp); count++; } @@ -3334,7 +3334,7 @@ __dump_posixlks(pl_inode_t *pl_inode) lock->client, NULL, &lock->granted_time.tv_sec, &lock->blkd_time.tv_sec, (lock->blocked) ? _gf_false : _gf_true); - gf_proc_dump_write(key, tmp); + gf_proc_dump_write(key, "%s", tmp); count++; } -- cgit