diff options
| author |  startx2017 <vradu.startx@yandex.com> | 2017-10-13 11:30:25 -0400 |
|---|---|---|
| committer | startx2017 <vradu.startx@yandex.com> | 2017-10-13 11:30:25 -0400 |
| commit | 11466d4430da22ee05eb2a1c13706986e719e5b2 (patch) | |
| tree | 27639ce36f432bd4eb1006648f8bb5a357b6ad2e /src/firejail/fs_mkdir.c | |
| parent | release allocd mem in private-bin (diff) | |
| download | firejail-11466d4430da22ee05eb2a1c13706986e719e5b2.tar.gz firejail-11466d4430da22ee05eb2a1c13706986e719e5b2.tar.zst firejail-11466d4430da22ee05eb2a1c13706986e719e5b2.zip | |
enhanced globbing for --blacklist
Diffstat (limited to 'src/firejail/fs_mkdir.c')
| -rw-r--r-- | src/firejail/fs_mkdir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/firejail/fs_mkdir.c b/src/firejail/fs_mkdir.c index 20ffe825a..7975ae323 100644 --- a/src/firejail/fs_mkdir.c +++ b/src/firejail/fs_mkdir.c | |||
| @@ -59,7 +59,7 @@ void fs_mkdir(const char *name) { | |||
| 59 | EUID_ASSERT(); | 59 | EUID_ASSERT(); |
| 60 | 60 | ||
| 61 | // check directory name | 61 | // check directory name |
| 62 | invalid_filename(name); | 62 | invalid_filename(name, 0); // no globbing |
| 63 | char *expanded = expand_home(name, cfg.homedir); | 63 | char *expanded = expand_home(name, cfg.homedir); |
| 64 | if (strncmp(expanded, cfg.homedir, strlen(cfg.homedir)) != 0 && | 64 | if (strncmp(expanded, cfg.homedir, strlen(cfg.homedir)) != 0 && |
| 65 | strncmp(expanded, "/tmp", 4) != 0) { | 65 | strncmp(expanded, "/tmp", 4) != 0) { |
| @@ -99,7 +99,7 @@ void fs_mkfile(const char *name) { | |||
| 99 | EUID_ASSERT(); | 99 | EUID_ASSERT(); |
| 100 | 100 | ||
| 101 | // check file name | 101 | // check file name |
| 102 | invalid_filename(name); | 102 | invalid_filename(name, 0); // no globbing |
| 103 | char *expanded = expand_home(name, cfg.homedir); | 103 | char *expanded = expand_home(name, cfg.homedir); |
| 104 | if (strncmp(expanded, cfg.homedir, strlen(cfg.homedir)) != 0 && | 104 | if (strncmp(expanded, cfg.homedir, strlen(cfg.homedir)) != 0 && |
| 105 | strncmp(expanded, "/tmp", 4) != 0) { | 105 | strncmp(expanded, "/tmp", 4) != 0) { |