mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-31 06:15:24 +00:00
Code Issues Releases Wiki Activity

proc_parse: don't play with a function exit code

Browse Source 
We should not have a chance to exit with a wrong code on error
paths.

|^^^\
|    \________________
| **                |_\
\_______/^^^^^^^/_____/
       /      /
      /     /
     /____/

Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Andrey Vagin
2015-04-21 16:54:37 +03:00
committed by Pavel Emelyanov
parent e448934a19
commit 6b4ecb90db
1 changed files with 18 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
proc_parse.c
View File

@@ -1239,7 +1239,7 @@ static int parse_fdinfo_pid_s(int pid, int fd, int type,
struct bfd f; struct bfd f;
char *str; char *str;
bool entry_met = false; bool entry_met = false;
int ret = -1; int ret, exit_code = -1;;
f.fd = open_proc(pid, "fdinfo/%d", fd); f.fd = open_proc(pid, "fdinfo/%d", fd);
if (f.fd < 0) { if (f.fd < 0) {
@@ -1401,7 +1401,6 @@ static int parse_fdinfo_pid_s(int pid, int fd, int type,
if (alloc_fhandle(&e->ffy.f_handle)) { if (alloc_fhandle(&e->ffy.f_handle)) {
free_fanotify_mark_entry(e); free_fanotify_mark_entry(e);
ret = -1;
goto out; goto out;
} }
parse_fhandle_encoded(str + hoff, &e->ffy.f_handle); parse_fhandle_encoded(str + hoff, &e->ffy.f_handle);
@@ -1478,7 +1477,6 @@ static int parse_fdinfo_pid_s(int pid, int fd, int type,
if (alloc_fhandle(ify->f_handle)) { if (alloc_fhandle(ify->f_handle)) {
free_inotify_wd_entry(e); free_inotify_wd_entry(e);
ret = -1;
goto out; goto out;
} }
@@ -1494,7 +1492,7 @@ static int parse_fdinfo_pid_s(int pid, int fd, int type,
} }
} }
ret = 0; exit_code = 0;
if (entry_met) if (entry_met)
goto out; goto out;
/* /*
@@ -1506,11 +1504,11 @@ static int parse_fdinfo_pid_s(int pid, int fd, int type,
pr_err("No records of type %d found in fdinfo file\n", type); pr_err("No records of type %d found in fdinfo file\n", type);
parse_err: parse_err:
ret = -1; exit_code = -1;
pr_perror("%s: error parsing [%s] for %d", __func__, str, type); pr_perror("%s: error parsing [%s] for %d", __func__, str, type);
out: out:
bclose(&f); bclose(&f);
return ret; return exit_code;
} }
int parse_fdinfo_pid(int pid, int fd, int type, int parse_fdinfo_pid(int pid, int fd, int type,
@@ -1600,7 +1598,7 @@ int parse_file_locks(void)
struct file_lock *fl; struct file_lock *fl;
FILE *fl_locks; FILE *fl_locks;
int ret = 0; int exit_code = -1;
bool is_blocked; bool is_blocked;
fl_locks = fopen_proc(PROC_GEN, "locks"); fl_locks = fopen_proc(PROC_GEN, "locks");
@@ -1615,13 +1613,11 @@ int parse_file_locks(void)
fl = alloc_file_lock(); fl = alloc_file_lock();
if (!fl) { if (!fl) {
pr_perror("Alloc file lock failed!"); pr_perror("Alloc file lock failed!");
ret = -1;
goto err; goto err;
} }
if (parse_file_lock_buf(buf, fl, is_blocked)) { if (parse_file_lock_buf(buf, fl, is_blocked)) {
xfree(fl); xfree(fl);
ret = -1;
goto err; goto err;
} }
@@ -1633,7 +1629,6 @@ int parse_file_locks(void)
if (fl->fl_kind == FL_UNKNOWN) { if (fl->fl_kind == FL_UNKNOWN) {
pr_err("Unknown file lock!\n"); pr_err("Unknown file lock!\n");
ret = -1;
xfree(fl); xfree(fl);
goto err; goto err;
} }
@@ -1662,9 +1657,10 @@ int parse_file_locks(void)
list_add_tail(&fl->list, &file_lock_list); list_add_tail(&fl->list, &file_lock_list);
} }
exit_code = 0;
err: err:
fclose(fl_locks); fclose(fl_locks);
return ret; return exit_code;
} }
void free_posix_timers(struct proc_posix_timers_stat *st) void free_posix_timers(struct proc_posix_timers_stat *st)
@@ -1894,7 +1890,7 @@ int parse_cgroups(struct list_head *cgroups, unsigned int *n_cgroups)
{ {
FILE *f; FILE *f;
char buf[1024], name[1024]; char buf[1024], name[1024];
int heirarchy, ret = 0; int heirarchy, exit_code = -1;
struct cg_controller *cur = NULL; struct cg_controller *cur = NULL;
f = fopen_proc(PROC_GEN, "cgroups"); f = fopen_proc(PROC_GEN, "cgroups");
@@ -1904,16 +1900,17 @@ int parse_cgroups(struct list_head *cgroups, unsigned int *n_cgroups)
} }
/* throw away the header */ /* throw away the header */
if (!fgets(buf, 1024, f)) { if (!fgets(buf, 1024, f))
ret = -1;
goto out; goto out;
}
while (fgets(buf, 1024, f)) { while (fgets(buf, 1024, f)) {
char *n; char *n;
char found = 0; char found = 0;
sscanf(buf, "%s %d", name, &heirarchy); if (sscanf(buf, "%s %d", name, &heirarchy) != 2) {
pr_err("Unable to parse: %s\n", buf);
goto out;
}
list_for_each_entry(cur, cgroups, l) { list_for_each_entry(cur, cgroups, l) {
if (cur->heirarchy == heirarchy) { if (cur->heirarchy == heirarchy) {
void *m; void *m;
@@ -1921,22 +1918,14 @@ int parse_cgroups(struct list_head *cgroups, unsigned int *n_cgroups)
found = 1; found = 1;
cur->n_controllers++; cur->n_controllers++;
m = xrealloc(cur->controllers, sizeof(char *) * cur->n_controllers); m = xrealloc(cur->controllers, sizeof(char *) * cur->n_controllers);
if (!m) { if (!m)
ret = -1;
goto out; goto out;
}
cur->controllers = m; cur->controllers = m;
if (!cur->controllers) {
ret = -1;
goto out;
}
n = xstrdup(name); n = xstrdup(name);
if (!n) { if (!n)
ret = -1;
goto out; goto out;
}
cur->controllers[cur->n_controllers-1] = n; cur->controllers[cur->n_controllers-1] = n;
break; break;
@@ -1945,18 +1934,17 @@ int parse_cgroups(struct list_head *cgroups, unsigned int *n_cgroups)
if (!found) { if (!found) {
struct cg_controller *nc = new_controller(name, heirarchy); struct cg_controller *nc = new_controller(name, heirarchy);
if (!nc) { if (!nc)
ret = -1;
goto out; goto out;
}
list_add_tail(&nc->l, &cur->l); list_add_tail(&nc->l, &cur->l);
(*n_cgroups)++; (*n_cgroups)++;
} }
} }
exit_code = 0;
out: out:
fclose(f); fclose(f);
return ret; return exit_code;
} }
/* /*