60 lines
1.6 KiB
Diff
60 lines
1.6 KiB
Diff
From d67982ddf6d742b92799d1fb2e4c89e8ff87d95b Mon Sep 17 00:00:00 2001
|
|
From: zhangsong234 <zhangsong34@huawei.com>
|
|
Date: Wed, 11 May 2022 15:55:47 +0800
|
|
Subject: [PATCH] fix dev read memory leak in container
|
|
|
|
Signed-off-by: zhangsong234 <zhangsong34@huawei.com>
|
|
---
|
|
src/proc_fuse.c | 7 +++++--
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/proc_fuse.c b/src/proc_fuse.c
|
|
index 0f66c40..6051e9a 100644
|
|
--- a/src/proc_fuse.c
|
|
+++ b/src/proc_fuse.c
|
|
@@ -497,7 +497,7 @@ struct devinfo* container_dev_read(pid_t pid) {
|
|
struct dirent *ptr;
|
|
struct stat dev_stat;
|
|
struct devinfo *head = NULL, *end;
|
|
- char fpath[100], dev_name[100];
|
|
+ char fpath[100], dev_name[101];
|
|
pid_t child_pid;
|
|
int mypipe[2];
|
|
int dev_num;
|
|
@@ -558,7 +558,7 @@ struct devinfo* container_dev_read(pid_t pid) {
|
|
}
|
|
closedir(dir);
|
|
stat("/", &dev_stat);
|
|
- dev_num = dev_stat.st_dev & (~0xf);
|
|
+ dev_num = dev_stat.st_dev;
|
|
fprintf(stream, "sda %d end 0 ", dev_num);
|
|
fflush(stream);
|
|
child_out:
|
|
@@ -574,6 +574,7 @@ child_out:
|
|
}
|
|
wait_for_pid(child_pid);
|
|
child_pid = 0;
|
|
+ memset(dev_name, 0, sizeof(dev_name));
|
|
while (fscanf(stream, "%100s%d", dev_name, &dev_num) == 2) {
|
|
if (dev_num == 0) {
|
|
break;
|
|
@@ -593,6 +594,7 @@ child_out:
|
|
end->name = must_copy_string(dev_name);
|
|
end->major = major(dev_num);
|
|
end->minor = minor(dev_num);
|
|
+ memset(dev_name, 0, sizeof(dev_name));
|
|
}
|
|
err:
|
|
if (stream)
|
|
@@ -883,6 +885,7 @@ static int proc_diskstats_read(char *buf, size_t size, off_t offset,
|
|
if (total_len > size)
|
|
total_len = size;
|
|
memcpy(buf, d->buf, total_len);
|
|
+ free_devinfo_list(container_devinfo);
|
|
|
|
return total_len;
|
|
}
|
|
--
|
|
1.8.3.1
|
|
|