diff options
author | Fred Barclay <Fred-Barclay@users.noreply.github.com> | 2017-05-24 14:13:52 -0500 |
---|---|---|
committer | Fred Barclay <Fred-Barclay@users.noreply.github.com> | 2017-05-24 14:13:52 -0500 |
commit | 96c920e166b40bbe50f216e294f2efac154a1cb2 (patch) | |
tree | fa80a34e81863ab897f2f2b8ec4124b10d023516 /src/firejail/cgroup.c | |
parent | remove trailing whitespace from etc/ (diff) | |
download | firejail-96c920e166b40bbe50f216e294f2efac154a1cb2.tar.gz firejail-96c920e166b40bbe50f216e294f2efac154a1cb2.tar.zst firejail-96c920e166b40bbe50f216e294f2efac154a1cb2.zip |
Remove trailing whitespace from src/
Diffstat (limited to 'src/firejail/cgroup.c')
-rw-r--r-- | src/firejail/cgroup.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/firejail/cgroup.c b/src/firejail/cgroup.c index 6ceb647ff..70f07dd23 100644 --- a/src/firejail/cgroup.c +++ b/src/firejail/cgroup.c | |||
@@ -25,7 +25,7 @@ | |||
25 | void save_cgroup(void) { | 25 | void save_cgroup(void) { |
26 | if (cfg.cgroup == NULL) | 26 | if (cfg.cgroup == NULL) |
27 | return; | 27 | return; |
28 | 28 | ||
29 | FILE *fp = fopen(RUN_CGROUP_CFG, "w"); | 29 | FILE *fp = fopen(RUN_CGROUP_CFG, "w"); |
30 | if (fp) { | 30 | if (fp) { |
31 | fprintf(fp, "%s", cfg.cgroup); | 31 | fprintf(fp, "%s", cfg.cgroup); |
@@ -36,7 +36,7 @@ void save_cgroup(void) { | |||
36 | } | 36 | } |
37 | else | 37 | else |
38 | goto errout; | 38 | goto errout; |
39 | 39 | ||
40 | return; | 40 | return; |
41 | 41 | ||
42 | errout: | 42 | errout: |
@@ -58,7 +58,7 @@ void load_cgroup(const char *fname) { | |||
58 | } | 58 | } |
59 | else | 59 | else |
60 | goto errout; | 60 | goto errout; |
61 | 61 | ||
62 | fclose(fp); | 62 | fclose(fp); |
63 | return; | 63 | return; |
64 | } | 64 | } |
@@ -71,34 +71,34 @@ errout: | |||
71 | 71 | ||
72 | void set_cgroup(const char *path) { | 72 | void set_cgroup(const char *path) { |
73 | EUID_ASSERT(); | 73 | EUID_ASSERT(); |
74 | 74 | ||
75 | invalid_filename(path); | 75 | invalid_filename(path); |
76 | 76 | ||
77 | // path starts with /sys/fs/cgroup | 77 | // path starts with /sys/fs/cgroup |
78 | if (strncmp(path, "/sys/fs/cgroup", 14) != 0) | 78 | if (strncmp(path, "/sys/fs/cgroup", 14) != 0) |
79 | goto errout; | 79 | goto errout; |
80 | 80 | ||
81 | // path ends in tasks | 81 | // path ends in tasks |
82 | char *ptr = strstr(path, "tasks"); | 82 | char *ptr = strstr(path, "tasks"); |
83 | if (!ptr) | 83 | if (!ptr) |
84 | goto errout; | 84 | goto errout; |
85 | if (*(ptr + 5) != '\0') | 85 | if (*(ptr + 5) != '\0') |
86 | goto errout; | 86 | goto errout; |
87 | 87 | ||
88 | // no .. traversal | 88 | // no .. traversal |
89 | ptr = strstr(path, ".."); | 89 | ptr = strstr(path, ".."); |
90 | if (ptr) | 90 | if (ptr) |
91 | goto errout; | 91 | goto errout; |
92 | 92 | ||
93 | // tasks file exists | 93 | // tasks file exists |
94 | struct stat s; | 94 | struct stat s; |
95 | if (stat(path, &s) == -1) | 95 | if (stat(path, &s) == -1) |
96 | goto errout; | 96 | goto errout; |
97 | 97 | ||
98 | // task file belongs to the user running the sandbox | 98 | // task file belongs to the user running the sandbox |
99 | if (s.st_uid != getuid() && s.st_gid != getgid()) | 99 | if (s.st_uid != getuid() && s.st_gid != getgid()) |
100 | goto errout2; | 100 | goto errout2; |
101 | 101 | ||
102 | // add the task to cgroup | 102 | // add the task to cgroup |
103 | /* coverity[toctou] */ | 103 | /* coverity[toctou] */ |
104 | FILE *fp = fopen(path, "a"); | 104 | FILE *fp = fopen(path, "a"); |
@@ -110,10 +110,10 @@ void set_cgroup(const char *path) { | |||
110 | fclose(fp); | 110 | fclose(fp); |
111 | return; | 111 | return; |
112 | 112 | ||
113 | errout: | 113 | errout: |
114 | fprintf(stderr, "Error: invalid cgroup\n"); | 114 | fprintf(stderr, "Error: invalid cgroup\n"); |
115 | exit(1); | 115 | exit(1); |
116 | errout2: | 116 | errout2: |
117 | fprintf(stderr, "Error: you don't have permissions to use this control group\n"); | 117 | fprintf(stderr, "Error: you don't have permissions to use this control group\n"); |
118 | exit(1); | 118 | exit(1); |
119 | } | 119 | } |