From ed9da2ab4417a8d1e97bb5386433809518015166 Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Sun, 8 Aug 2010 16:02:30 +0000 Subject: [PATCH] Don't use *printf. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2908 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- src/vserver-stat.c | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/src/vserver-stat.c b/src/vserver-stat.c index 101b916..4b298f1 100644 --- a/src/vserver-stat.c +++ b/src/vserver-stat.c @@ -308,6 +308,7 @@ registerXidCgroups(struct Vector *vec, struct process_info *process) ssize_t cgroup_len; unsigned long long rss; char *endptr; + size_t len; if (vc_virt_stat(xid, &vstat) == -1) { perror("vc_virt_stat()"); @@ -338,14 +339,33 @@ registerXidCgroups(struct Vector *vec, struct process_info *process) cgroup[cgroup_len] = 0; } - snprintf(filename, sizeof(filename), "%s/cgroup/name", vhi_name); + len = strlen(vhi_name); + if ((len + sizeof("/cgroup/name")) >= sizeof(filename)) { + WRITE_MSG(2, "too long context name: "); + WRITE_STR(2, vhi_name); + WRITE_MSG(2, "\n"); + return; + } + strcpy(filename, vhi_name); + strcpy(filename + len, "/cgroup/name"); + if ((fd = open(filename, O_RDONLY)) == -1) { char *dir = strrchr(vhi_name, '/'); if (dir == NULL) { - fprintf(stderr, "invalid context name: %s\n", dir); + WRITE_MSG(2, "invalid context name: "); + WRITE_STR(2, dir); + WRITE_MSG(2, "\n"); + return; + } + len = strlen(dir); + if ((len + cgroup_len) >= sizeof(cgroup)) { + WRITE_MSG(2, "cgroup name too long: "); + WRITE_STR(2, dir); + WRITE_MSG(2, "\n"); return; } - snprintf(cgroup + cgroup_len, sizeof(cgroup) - cgroup_len, "%s", dir); + strcpy(cgroup + cgroup_len, dir); + cgroup_len += len; } else { ssize_t ret; @@ -354,10 +374,19 @@ registerXidCgroups(struct Vector *vec, struct process_info *process) perror("read(cgroup/name)"); return; } + cgroup_len += ret; close(fd); } - snprintf(filename, sizeof(filename), "%s/memory.usage_in_bytes", cgroup); + if ((cgroup_len + sizeof("/memory.usage_in_bytes")) > sizeof(filename)) { + WRITE_MSG(2, "cgroup name too long: "); + WRITE_STR(2, cgroup); + WRITE_MSG(2, "\n"); + return; + } + strcpy(filename, cgroup); + strcpy(filename + cgroup_len, "/memory.usage_in_bytes"); + if ((fd = open(filename, O_RDONLY)) == -1) { perror("open(memory.usage_in_bytes)"); return; -- 1.8.1.5