diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-29 22:54:29 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-29 22:54:29 +0000 |
| commit | 0ff5ae8abf03b712c34e869948652f20dbd858f9 (patch) | |
| tree | bbb253ebe3936896c27af17928c80ed7025d9244 /apps/app_mp3.c | |
| parent | 2a514c914219bb3e8628021109b509d8087488d4 (diff) | |
Lose the CAP_NET_ADMIN at every fork, instead of at startup. Otherwise, if
Asterisk runs as a non-root user and the administrator does a 'restart now',
Asterisk loses the ability to set QOS on packets.
(closes issue #14004)
Reported by: nemo
Patches:
20090105__bug14004.diff.txt uploaded by Corydon76 (license 14)
Tested by: Corydon76
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@172438 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_mp3.c')
| -rw-r--r-- | apps/app_mp3.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/apps/app_mp3.c b/apps/app_mp3.c index 55d50f011..7cacc1e77 100644 --- a/apps/app_mp3.c +++ b/apps/app_mp3.c @@ -25,6 +25,10 @@ * \ingroup applications */ +/*** MODULEINFO + <depend>working_fork</depend> + ***/ + #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") @@ -36,6 +40,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <unistd.h> #include <fcntl.h> #include <sys/time.h> +#ifdef HAVE_CAP +#include <sys/capability.h> +#endif /* HAVE_CAP */ #include "asterisk/lock.h" #include "asterisk/file.h" @@ -65,6 +72,9 @@ static int mp3play(char *filename, int fd) int res; int x; sigset_t fullset, oldset; +#ifdef HAVE_CAP + cap_t cap; +#endif sigfillset(&fullset); pthread_sigmask(SIG_BLOCK, &fullset, &oldset); @@ -76,6 +86,15 @@ static int mp3play(char *filename, int fd) pthread_sigmask(SIG_SETMASK, &oldset, NULL); return res; } +#ifdef HAVE_CAP + cap = cap_from_text("cap_net_admin-eip"); + + if (cap_set_proc(cap)) { + /* Careful with order! Logging cannot happen after we close FDs */ + ast_log(LOG_WARNING, "Unable to remove capabilities.\n"); + } + cap_free(cap); +#endif if (ast_opt_high_priority) ast_set_priority(0); signal(SIGPIPE, SIG_DFL); @@ -83,8 +102,7 @@ static int mp3play(char *filename, int fd) dup2(fd, STDOUT_FILENO); for (x=STDERR_FILENO + 1;x<256;x++) { - if (x != STDOUT_FILENO) - close(x); + close(x); } /* Execute mpg123, but buffer if it's a net connection */ if (!strncasecmp(filename, "http://", 7)) { |