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

Better fix for r314098

Browse Source 
The actual issue was the fact that if - was used then some restriction were
already set to stdin when we were applying caph_limit_stdio which was failing
due to the fact the fd was the fd was already restricted to lower rights.

Restricting stdio before actually opening the files prevent trying to raise the
right and fixes the issue.

And this allows to keep failing the program if restriction failed

Approved by:	allanjude
Differential Revision:	https://reviews.freebsd.org/D9723
This commit is contained in:
Baptiste Daroussin 2017-02-22 16:37:45 +00:00
parent e872af3a64
commit 0064a5b36d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.bin/lam/lam.c
View File

@ -86,6 +86,8 @@ main(int argc, char *argv[])
if (argc == 1)
usage();
if (caph_limit_stdio() == -1)
err(1, "unable to limit stdio");
getargs(argv);
if (!morefiles)
usage();
@ -95,7 +97,6 @@ main(int argc, char *argv[])
* mode.
*/
caph_cache_catpages();
caph_limit_stdio();
if (cap_enter() < 0 && errno != ENOSYS)
err(1, "unable to enter capability mode");