External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 06:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

lxc: fuse: Fix /proc/meminfo size calculation

Browse Source 
We virtualize bits of /proc/meminfo by replacing host values with
values specific to the container.

However for calculating the final size of the returned data, we are
using the size of the original file and not the altered copy, which
could give garbelled output.
This commit is contained in:
Cole Robinson 2016-01-21 13:14:54 -05:00
parent f65dcfcd14
commit 8418245a7e
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lxc/lxc_fuse.c
View File

@ -131,7 +131,6 @@ static int lxcProcHostRead(char *path, char *buf, size_t size, off_t offset)
static int lxcProcReadMeminfo(char *hostpath, virDomainDefPtr def,
char *buf, size_t size, off_t offset)
{
int copied = 0;
int res;
FILE *fd = NULL;
char *line = NULL;
@ -159,7 +158,7 @@ static int lxcProcReadMeminfo(char *hostpath, virDomainDefPtr def,
}
res = -1;
while (copied < size && getline(&line, &n, fd) > 0) {
while (getline(&line, &n, fd) > 0) {
char *ptr = strchr(line, ':');
if (!ptr)
continue;
@ -219,13 +218,11 @@ static int lxcProcReadMeminfo(char *hostpath, virDomainDefPtr def,
res = -errno;
goto cleanup;
}
copied += strlen(line);
if (copied > size)
copied = size;
}
res = copied;
memcpy(buf, virBufferCurrentContent(new_meminfo), copied);
res = strlen(virBufferCurrentContent(new_meminfo));
if (res > size)
res = size;
memcpy(buf, virBufferCurrentContent(new_meminfo), res);
cleanup:
VIR_FREE(line);