Commit 0325862d authored by Colin Ian King's avatar Colin Ian King Committed by Arnaldo Carvalho de Melo

perf probe: Check for dup and fdopen failures

dup and fdopen can potentially fail, so add some extra
error handling checks rather than assuming they always work.
Signed-off-by: default avatarColin King <colin.king@canonical.com>
Acked-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1471038296-12956-1-git-send-email-colin.king@canonical.com
[ Free resources when those functions (now being verified) fail ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 50de1a0c
...@@ -133,7 +133,7 @@ int probe_file__open_both(int *kfd, int *ufd, int flag) ...@@ -133,7 +133,7 @@ int probe_file__open_both(int *kfd, int *ufd, int flag)
/* Get raw string list of current kprobe_events or uprobe_events */ /* Get raw string list of current kprobe_events or uprobe_events */
struct strlist *probe_file__get_rawlist(int fd) struct strlist *probe_file__get_rawlist(int fd)
{ {
int ret, idx; int ret, idx, fddup;
FILE *fp; FILE *fp;
char buf[MAX_CMDLEN]; char buf[MAX_CMDLEN];
char *p; char *p;
...@@ -144,7 +144,14 @@ struct strlist *probe_file__get_rawlist(int fd) ...@@ -144,7 +144,14 @@ struct strlist *probe_file__get_rawlist(int fd)
sl = strlist__new(NULL, NULL); sl = strlist__new(NULL, NULL);
fp = fdopen(dup(fd), "r"); fddup = dup(fd);
if (fddup < 0)
goto out_free_sl;
fp = fdopen(fddup, "r");
if (!fp)
goto out_close_fddup;
while (!feof(fp)) { while (!feof(fp)) {
p = fgets(buf, MAX_CMDLEN, fp); p = fgets(buf, MAX_CMDLEN, fp);
if (!p) if (!p)
...@@ -163,6 +170,12 @@ struct strlist *probe_file__get_rawlist(int fd) ...@@ -163,6 +170,12 @@ struct strlist *probe_file__get_rawlist(int fd)
fclose(fp); fclose(fp);
return sl; return sl;
out_close_fddup:
close(fddup);
out_free_sl:
strlist__delete(sl);
return NULL;
} }
static struct strlist *__probe_file__get_namelist(int fd, bool include_group) static struct strlist *__probe_file__get_namelist(int fd, bool include_group)
...@@ -447,10 +460,13 @@ static int probe_cache__load(struct probe_cache *pcache) ...@@ -447,10 +460,13 @@ static int probe_cache__load(struct probe_cache *pcache)
{ {
struct probe_cache_entry *entry = NULL; struct probe_cache_entry *entry = NULL;
char buf[MAX_CMDLEN], *p; char buf[MAX_CMDLEN], *p;
int ret = 0; int ret = 0, fddup;
FILE *fp; FILE *fp;
fp = fdopen(dup(pcache->fd), "r"); fddup = dup(pcache->fd);
if (fddup < 0)
return -errno;
fp = fdopen(fddup, "r");
if (!fp) if (!fp)
return -EINVAL; return -EINVAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment