diff options
| author |  smitsohu <smitsohu@gmail.com> | 2018-09-01 12:56:30 +0200 |
|---|---|---|
| committer | smitsohu <smitsohu@gmail.com> | 2018-09-01 12:56:30 +0200 |
| commit | 50dcaf8fbf5ca180d2711fec54cbb33ff38d7890 (patch) | |
| tree | 760ce80703d8eedbf1025002ca97a44af7c64e5d | |
| parent | consolidate and enhance checks run on chroot directory hierarchy (patch n/n) (diff) | |
| download | firejail-50dcaf8fbf5ca180d2711fec54cbb33ff38d7890.tar.gz firejail-50dcaf8fbf5ca180d2711fec54cbb33ff38d7890.tar.zst firejail-50dcaf8fbf5ca180d2711fec54cbb33ff38d7890.zip | |
error strings
| -rw-r--r-- | src/firejail/fs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/firejail/fs.c b/src/firejail/fs.c index 0080f3de2..09c26fc92 100644 --- a/src/firejail/fs.c +++ b/src/firejail/fs.c | |||
| @@ -1187,7 +1187,7 @@ void fs_check_chroot_dir(const char *rootdir) { | |||
| 1187 | // check /dev | 1187 | // check /dev |
| 1188 | fd = openat(parentfd, "dev", O_PATH|O_CLOEXEC); | 1188 | fd = openat(parentfd, "dev", O_PATH|O_CLOEXEC); |
| 1189 | if (fd == -1) { | 1189 | if (fd == -1) { |
| 1190 | fprintf(stderr, "Error: cannot find /dev in chroot directory\n"); | 1190 | fprintf(stderr, "Error: cannot open /dev in chroot directory\n"); |
| 1191 | exit(1); | 1191 | exit(1); |
| 1192 | } | 1192 | } |
| 1193 | if (fstat(fd, &s) == -1) | 1193 | if (fstat(fd, &s) == -1) |
| @@ -1201,7 +1201,7 @@ void fs_check_chroot_dir(const char *rootdir) { | |||
| 1201 | // check /var/tmp | 1201 | // check /var/tmp |
| 1202 | fd = openat(parentfd, "var/tmp", O_PATH|O_CLOEXEC); | 1202 | fd = openat(parentfd, "var/tmp", O_PATH|O_CLOEXEC); |
| 1203 | if (fd == -1) { | 1203 | if (fd == -1) { |
| 1204 | fprintf(stderr, "Error: cannot find /var/tmp in chroot directory\n"); | 1204 | fprintf(stderr, "Error: cannot open /var/tmp in chroot directory\n"); |
| 1205 | exit(1); | 1205 | exit(1); |
| 1206 | } | 1206 | } |
| 1207 | if (fstat(fd, &s) == -1) | 1207 | if (fstat(fd, &s) == -1) |
| @@ -1215,7 +1215,7 @@ void fs_check_chroot_dir(const char *rootdir) { | |||
| 1215 | // check /proc | 1215 | // check /proc |
| 1216 | fd = openat(parentfd, "proc", O_PATH|O_CLOEXEC); | 1216 | fd = openat(parentfd, "proc", O_PATH|O_CLOEXEC); |
| 1217 | if (fd == -1) { | 1217 | if (fd == -1) { |
| 1218 | fprintf(stderr, "Error: cannot find /proc in chroot directory\n"); | 1218 | fprintf(stderr, "Error: cannot open /proc in chroot directory\n"); |
| 1219 | exit(1); | 1219 | exit(1); |
| 1220 | } | 1220 | } |
| 1221 | if (fstat(fd, &s) == -1) | 1221 | if (fstat(fd, &s) == -1) |
| @@ -1229,7 +1229,7 @@ void fs_check_chroot_dir(const char *rootdir) { | |||
| 1229 | // check /tmp | 1229 | // check /tmp |
| 1230 | fd = openat(parentfd, "tmp", O_PATH|O_CLOEXEC); | 1230 | fd = openat(parentfd, "tmp", O_PATH|O_CLOEXEC); |
| 1231 | if (fd == -1) { | 1231 | if (fd == -1) { |
| 1232 | fprintf(stderr, "Error: cannot find /tmp in chroot directory\n"); | 1232 | fprintf(stderr, "Error: cannot open /tmp in chroot directory\n"); |
| 1233 | exit(1); | 1233 | exit(1); |
| 1234 | } | 1234 | } |
| 1235 | if (fstat(fd, &s) == -1) | 1235 | if (fstat(fd, &s) == -1) |
| @@ -1243,7 +1243,7 @@ void fs_check_chroot_dir(const char *rootdir) { | |||
| 1243 | // check /etc | 1243 | // check /etc |
| 1244 | fd = openat(parentfd, "etc", O_PATH|O_CLOEXEC); | 1244 | fd = openat(parentfd, "etc", O_PATH|O_CLOEXEC); |
| 1245 | if (fd == -1) { | 1245 | if (fd == -1) { |
| 1246 | fprintf(stderr, "Error: cannot find /etc in chroot directory\n"); | 1246 | fprintf(stderr, "Error: cannot open /etc in chroot directory\n"); |
| 1247 | exit(1); | 1247 | exit(1); |
| 1248 | } | 1248 | } |
| 1249 | if (fstat(fd, &s) == -1) | 1249 | if (fstat(fd, &s) == -1) |
| @@ -1290,7 +1290,7 @@ void fs_check_chroot_dir(const char *rootdir) { | |||
| 1290 | if (getenv("FIREJAIL_X11")) { | 1290 | if (getenv("FIREJAIL_X11")) { |
| 1291 | fd = openat(parentfd, "tmp/.X11-unix", O_PATH|O_CLOEXEC); | 1291 | fd = openat(parentfd, "tmp/.X11-unix", O_PATH|O_CLOEXEC); |
| 1292 | if (fd == -1) { | 1292 | if (fd == -1) { |
| 1293 | fprintf(stderr, "Error: cannot find /tmp/.X11-unix in chroot directory\n"); | 1293 | fprintf(stderr, "Error: cannot open /tmp/.X11-unix in chroot directory\n"); |
| 1294 | exit(1); | 1294 | exit(1); |
| 1295 | } | 1295 | } |
| 1296 | if (fstat(fd, &s) == -1) | 1296 | if (fstat(fd, &s) == -1) |