d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better error checking

Browse Source 
if getcwd fails: just ignore it and do not try to adding to the list of possible
path where to find the files.

if fdopen fails, warn and return NULL the rest of the code knows how to deal
with it

Reported by:	oshogbo
This commit is contained in:
Baptiste Daroussin 2016-09-18 18:03:06 +00:00
parent b2c71bcefc
commit 160af93197
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=305945
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
usr.bin/soelim/soelim.c
View File

@ -68,6 +68,7 @@ relpath(const char *path)
static FILE * static FILE *
soelim_fopen(int rootfd, const char *name) soelim_fopen(int rootfd, const char *name)
{ {
FILE *f = NULL;
char path[PATH_MAX]; char path[PATH_MAX];
size_t i; size_t i;
int fd; int fd;
@ -75,8 +76,10 @@ soelim_fopen(int rootfd, const char *name)
if (strcmp(name, "-") == 0) if (strcmp(name, "-") == 0)
return (stdin); return (stdin);
if ((fd = openat(rootfd, relpath(name), O_RDONLY)) != -1) if ((fd = openat(rootfd, relpath(name), O_RDONLY)) != -1) {
return (fdopen(fd, "r")); f = fdopen(fd, "r");
goto out;
}
if (*name == '/') { if (*name == '/') {
warn("can't open '%s'", name); warn("can't open '%s'", name);
@ -86,13 +89,17 @@ soelim_fopen(int rootfd, const char *name)
for (i = 0; i < includes->sl_cur; i++) { for (i = 0; i < includes->sl_cur; i++) {
snprintf(path, sizeof(path), "%s/%s", includes->sl_str[i], snprintf(path, sizeof(path), "%s/%s", includes->sl_str[i],
name); name);
if ((fd = openat(rootfd, relpath(path), O_RDONLY)) != -1) if ((fd = openat(rootfd, relpath(path), O_RDONLY)) != -1) {
return (fdopen(fd, "r")); f = fdopen(fd, "r");
break;
}
} }
warn("can't open '%s'", name); out:
if (f == NULL)
warn("can't open '%s'", name);
return (NULL); return (f);
} }
static int static int
@ -157,7 +164,9 @@ main(int argc, char **argv)
cap_rights_t rights; cap_rights_t rights;
includes = sl_init(); includes = sl_init();
sl_add(includes, getcwd(cwd, sizeof(cwd))); if (getcwd(cwd, sizeof(cwd)) != NULL)
sl_add(includes, cwd);
if (includes == NULL) if (includes == NULL)
err(EXIT_FAILURE, "sl_init()"); err(EXIT_FAILURE, "sl_init()");
@ -196,6 +205,8 @@ main(int argc, char **argv)
if (cap_rights_limit(STDERR_FILENO, &rights) < 0 && errno != ENOSYS) if (cap_rights_limit(STDERR_FILENO, &rights) < 0 && errno != ENOSYS)
err(EXIT_FAILURE, "unable to limit rights for stderr"); err(EXIT_FAILURE, "unable to limit rights for stderr");
rootfd = open("/", O_DIRECTORY | O_RDONLY); rootfd = open("/", O_DIRECTORY | O_RDONLY);
if (rootfd == -1)
err(EXIT_FAILURE, "unable to open '/'");
cap_rights_init(&rights, CAP_READ, CAP_LOOKUP, CAP_FSTAT, CAP_FCNTL); cap_rights_init(&rights, CAP_READ, CAP_LOOKUP, CAP_FSTAT, CAP_FCNTL);
if (cap_rights_limit(rootfd, &rights) < 0 && errno != ENOSYS) if (cap_rights_limit(rootfd, &rights) < 0 && errno != ENOSYS)
err(EXIT_FAILURE, "unable to limit rights"); err(EXIT_FAILURE, "unable to limit rights");