From 58ec01b35c046f5f167763343514c20170bfd2eb Mon Sep 17 00:00:00 2001 From: Alexander Sverdlin Date: Sun, 29 Mar 2015 20:44:04 +0200 Subject: systemd-bootchart: Prevent leaking file descriptors in open-fdopen combination Correctly handle the potential failure of fdopen() (because of OOM, for instance) after potentially successful open(). Prevent leaking open fd in such case. --- src/bootchart/store.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/bootchart/store.c') diff --git a/src/bootchart/store.c b/src/bootchart/store.c index 3900936ac..8e9a62f91 100644 --- a/src/bootchart/store.c +++ b/src/bootchart/store.c @@ -330,9 +330,13 @@ schedstat_next: /* ppid */ sprintf(filename, "%d/stat", pid); fd = openat(procfd, filename, O_RDONLY); + if (fd == -1) + continue; st = fdopen(fd, "r"); - if (!st) + if (!st) { + close(fd); continue; + } if (!fscanf(st, "%*s %*s %*s %i", &p)) { continue; } @@ -432,9 +436,13 @@ schedstat_next: if (!ps->smaps) { sprintf(filename, "%d/smaps", pid); fd = openat(procfd, filename, O_RDONLY); + if (fd == -1) + continue; ps->smaps = fdopen(fd, "r"); - if (!ps->smaps) + if (!ps->smaps) { + close(fd); continue; + } setvbuf(ps->smaps, smaps_buf, _IOFBF, sizeof(smaps_buf)); } else { -- cgit v1.2.3