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 /libglusterfs/src/fd.c | |
| 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 'libglusterfs/src/fd.c')
| -rw-r--r-- | libglusterfs/src/fd.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libglusterfs/src/fd.c b/libglusterfs/src/fd.c index d26b7097fd4..6c521317110 100644 --- a/libglusterfs/src/fd.c +++ b/libglusterfs/src/fd.c @@ -992,13 +992,14 @@ fd_dump(fd_t *fd, char *prefix) if (!fd) return; - gf_proc_dump_write("pid", "%llu", fd->pid); - gf_proc_dump_write("refcount", "%d", fd->refcount); + gf_proc_dump_write("pid", "%" PRIu64, fd->pid); + gf_proc_dump_write("refcount", "%" GF_PRI_ATOMIC, + GF_ATOMIC_GET(fd->refcount)); gf_proc_dump_write("flags", "%d", fd->flags); if (fd->inode) { gf_proc_dump_build_key(key, "inode", NULL); - gf_proc_dump_add_section(key); + gf_proc_dump_add_section("%s", key); inode_dump(fd->inode, key); } } @@ -1040,7 +1041,7 @@ fdtable_dump(fdtable_t *fdtable, char *prefix) for (i = 0; i < fdtable->max_fds; i++) { if (GF_FDENTRY_ALLOCATED == fdtable->fdentries[i].next_free) { gf_proc_dump_build_key(key, prefix, "fdentry[%d]", i); - gf_proc_dump_add_section(key); + gf_proc_dump_add_section("%s", key); fdentry_dump(&fdtable->fdentries[i], key); } } |