diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2006-07-12 16:53:51 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2006-07-12 16:53:51 +0000 |
| commit | 7813904efcb06a48358f73dce1ce8fe731870781 (patch) | |
| tree | 8f12bd950a809e7ef4fe970234df2afd9df8cf81 /libsandbox | |
| parent | Add patch for using open() to test if the file exists, bug #135745. (diff) | |
| download | sandbox-7813904efcb06a48358f73dce1ce8fe731870781.tar.gz sandbox-7813904efcb06a48358f73dce1ce8fe731870781.tar.bz2 sandbox-7813904efcb06a48358f73dce1ce8fe731870781.zip | |
Make sure we do not segfault with invalid mode passed to fopen() and co. Add note about allowing different errno to be returned.
Signed-off-by: Martin Schlemmer <azarah@gentoo.org>
Diffstat (limited to 'libsandbox')
| -rw-r--r-- | libsandbox/libsandbox.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/libsandbox/libsandbox.c b/libsandbox/libsandbox.c index 758cc9f..5ab3090 100644 --- a/libsandbox/libsandbox.c +++ b/libsandbox/libsandbox.c @@ -1020,6 +1020,9 @@ int before_syscall(const char *func, const char *file) if ((NULL != getenv(ENV_SANDBOX_PID)) && (is_env_on(ENV_SANDBOX_ABORT))) kill(atoi(getenv(ENV_SANDBOX_PID)), SIGUSR1); + /* FIXME: Should probably audit errno, and enable some other + * error to be returned (EINVAL for invalid mode for + * fopen() and co, ETOOLONG, etc). */ errno = EACCES; } @@ -1046,9 +1049,12 @@ int before_syscall_open_int(const char *func, const char *file, int flags) int before_syscall_open_char(const char *func, const char *file, const char *mode) { - if (*mode == 'r' && (0 == (strcmp(mode, "r")) || - /* The strspn accept args are known non-writable modifiers */ - (strlen(++mode) == strspn(mode, "xbtmc")))) { + if (NULL == mode) + return 0; + + if ((*mode == 'r') && ((0 == (strcmp(mode, "r"))) || + /* The strspn accept args are known non-writable modifiers */ + (strlen(++mode) == strspn(mode, "xbtmc")))) { return before_syscall("open_rd", file); } else { return before_syscall("open_wr", file); |