mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-10 06:47:55 -08:00
Code

add unveil(2) to mixerctl(1)

Browse Source 
after we know what is the mixer device to be used, either through MIXERDEVICE
env var, the argument passed or by default /dev/mixer then we can unveil it in
read/write mode, then if opening fails we reduce unveil to only read mode.

Once open(2) succeeds then we can disable fs access by calling unveil(NULL, NULL)
since all further operations occur on fds.

A cleaner solution would be to just call pledge("audio") after open(2) but
currently the ioctls used are not whitelisted in pledge(2), ratchov@ will
investigate a better way to do this

OK ratchov@
This commit is contained in:
mestre 2018-08-08 19:35:47 +00:00
parent b595b381da
commit b2fbf4f7d7
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
usr.bin/mixerctl/mixerctl.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: mixerctl.c,v 1.30 2015/02/08 23:40:34 deraadt Exp $ */
/* $OpenBSD: mixerctl.c,v 1.31 2018/08/08 19:35:47 mestre Exp $ */
/* $NetBSD: mixerctl.c,v 1.11 1998/04/27 16:55:23 augustss Exp $ */
/*
@ -283,10 +283,20 @@ main(int argc, char **argv)
if (argc == 0 && tflag == 0)
aflag = 1;
if ((fd = open(file, O_RDWR)) == -1)
if (unveil(file, "rw") == -1)
err(1, "unveil");
if ((fd = open(file, O_RDWR)) == -1) {
if (unveil(file, "r") == -1)
err(1, "unveil");
if ((fd = open(file, O_RDONLY)) == -1)
err(1, "%s", file);
}
if (unveil(NULL, NULL) == -1)
err(1, "unveil");
for (ndev = 0; ; ndev++) {
dinfo.index = ndev;