summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-11-30 22:40:51 +0100
committerwm4 <wm4@nowhere>2013-11-30 22:40:51 +0100
commit95cfe58e3db9d939abe7a9a26116c1d576eed60b (patch)
tree98a4738f2f989c900702d84ef8a257f9413389af /stream
parenteea69682a6a874d540f9fc576c937466970713f6 (diff)
downloadmpv-95cfe58e3db9d939abe7a9a26116c1d576eed60b.tar.bz2
mpv-95cfe58e3db9d939abe7a9a26116c1d576eed60b.tar.xz
Use O_CLOEXEC when creating FDs
This is needed so that new processes (created with fork+exec) don't inherit open files, which can be important for a number of reasons. Since O_CLOEXEC is relatively new (POSIX.1-2008, before that Linux specific), we #define it to 0 in io.h to prevent compilation errors on older/crappy systems. At least this is the plan. input.c creates a pipe. For that, add a mp_set_cloexec() function (which is based on Weston's code in vo_wayland.c, but more correct). We could use pipe2() instead, but that is Linux specific. Technically, we have a race condition, but it won't matter.
Diffstat (limited to 'stream')
-rw-r--r--stream/ai_oss.c4
-rw-r--r--stream/cookies.c2
-rw-r--r--stream/dvb_tune.c10
-rw-r--r--stream/stream_dvb.c7
-rw-r--r--stream/stream_dvd_common.c4
-rw-r--r--stream/stream_file.c6
-rw-r--r--stream/stream_pvr.c4
-rw-r--r--stream/stream_radio.c7
-rw-r--r--stream/stream_vcd.c4
9 files changed, 32 insertions, 16 deletions
diff --git a/stream/ai_oss.c b/stream/ai_oss.c
index 46e232b264..d222490430 100644
--- a/stream/ai_oss.c
+++ b/stream/ai_oss.c
@@ -36,6 +36,8 @@
#endif
#endif
+#include "osdep/io.h"
+
#include "audio_in.h"
#include "mpvcore/mp_msg.h"
@@ -85,7 +87,7 @@ int ai_oss_init(audio_in_t *ai)
int err;
int ioctl_param;
- ai->oss.audio_fd = open(ai->oss.device, O_RDONLY);
+ ai->oss.audio_fd = open(ai->oss.device, O_RDONLY | O_CLOEXEC);
if (ai->oss.audio_fd < 0)
{
mp_tmsg(MSGT_TV, MSGL_ERR, "Unable to open '%s': %s\n",
diff --git a/stream/cookies.c b/stream/cookies.c
index e0cfca7681..b5815da6e5 100644
--- a/stream/cookies.c
+++ b/stream/cookies.c
@@ -99,7 +99,7 @@ static char *load_file(const char *filename, int64_t * length)
mp_msg(MSGT_NETWORK, MSGL_V, "Loading cookie file: %s\n", filename);
- fd = open(filename, O_RDONLY);
+ fd = open(filename, O_RDONLY | O_CLOEXEC);
if (fd < 0) {
mp_msg(MSGT_NETWORK, MSGL_V, "Could not open");
goto err_out;
diff --git a/stream/dvb_tune.c b/stream/dvb_tune.c
index ded2e28681..ddeabd2385 100644
--- a/stream/dvb_tune.c
+++ b/stream/dvb_tune.c
@@ -34,7 +34,9 @@
#include <errno.h>
#include <linux/dvb/dmx.h>
#include <linux/dvb/frontend.h>
+
#include "config.h"
+#include "osdep/io.h"
#include "dvbin.h"
#include "dvb_tune.h"
#include "mpvcore/mp_msg.h"
@@ -88,7 +90,7 @@ int dvb_open_devices(dvb_priv_t *priv, int n, int demux_cnt)
sprintf(frontend_dev, "/dev/dvb/adapter%d/frontend0", n);
sprintf(dvr_dev, "/dev/dvb/adapter%d/dvr0", n);
sprintf(demux_dev, "/dev/dvb/adapter%d/demux0", n);
- priv->fe_fd = open(frontend_dev, O_RDWR | O_NONBLOCK);
+ priv->fe_fd = open(frontend_dev, O_RDWR | O_NONBLOCK | O_CLOEXEC);
if(priv->fe_fd < 0)
{
mp_msg(MSGT_DEMUX, MSGL_ERR, "ERROR OPENING FRONTEND DEVICE %s: ERRNO %d\n", frontend_dev, errno);
@@ -98,7 +100,7 @@ int dvb_open_devices(dvb_priv_t *priv, int n, int demux_cnt)
mp_msg(MSGT_DEMUX, MSGL_V, "DVB_OPEN_DEVICES(%d)\n", demux_cnt);
for(i = 0; i < demux_cnt; i++)
{
- priv->demux_fds[i] = open(demux_dev, O_RDWR | O_NONBLOCK);
+ priv->demux_fds[i] = open(demux_dev, O_RDWR | O_NONBLOCK | O_CLOEXEC);
if(priv->demux_fds[i] < 0)
{
mp_msg(MSGT_DEMUX, MSGL_ERR, "ERROR OPENING DEMUX 0: %d\n", errno);
@@ -112,7 +114,7 @@ int dvb_open_devices(dvb_priv_t *priv, int n, int demux_cnt)
}
- priv->dvr_fd = open(dvr_dev, O_RDONLY| O_NONBLOCK);
+ priv->dvr_fd = open(dvr_dev, O_RDONLY| O_NONBLOCK | O_CLOEXEC);
if(priv->dvr_fd < 0)
{
mp_msg(MSGT_DEMUX, MSGL_ERR, "ERROR OPENING DVR DEVICE %s: %d\n", dvr_dev, errno);
@@ -143,7 +145,7 @@ int dvb_fix_demuxes(dvb_priv_t *priv, int cnt)
{
for(i = priv->demux_fds_cnt; i < cnt; i++)
{
- priv->demux_fds[i] = open(demux_dev, O_RDWR | O_NONBLOCK);
+ priv->demux_fds[i] = open(demux_dev, O_RDWR | O_NONBLOCK | O_CLOEXEC);
mp_msg(MSGT_DEMUX, MSGL_V, "FIX, OPEN fd(%d): %d\n", i, priv->demux_fds[i]);
if(priv->demux_fds[i] < 0)
{
diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c
index b34e80b226..71e9b87199 100644
--- a/stream/stream_dvb.c
+++ b/stream/stream_dvb.c
@@ -42,10 +42,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include <fcntl.h>
#include <errno.h>
+#include <libavutil/avstring.h>
+
+#include "osdep/io.h"
+
#include "stream.h"
#include "mpvcore/m_option.h"
#include "mpvcore/path.h"
-#include "libavutil/avstring.h"
#include "dvbin.h"
@@ -735,7 +738,7 @@ dvb_config_t *dvb_get_config(void)
for(i=0; i<MAX_CARDS; i++)
{
snprintf(filename, sizeof(filename), "/dev/dvb/adapter%d/frontend0", i);
- fd = open(filename, O_RDONLY|O_NONBLOCK);
+ fd = open(filename, O_RDONLY|O_NONBLOCK|O_CLOEXEC);
if(fd < 0)
{
mp_msg(MSGT_DEMUX, MSGL_V, "DVB_CONFIG, can't open device %s, skipping\n", filename);
diff --git a/stream/stream_dvd_common.c b/stream/stream_dvd_common.c
index 3416eea094..b079f97d06 100644
--- a/stream/stream_dvd_common.c
+++ b/stream/stream_dvd_common.c
@@ -39,6 +39,8 @@
#include <sys/ioctl.h>
#endif
+#include "osdep/io.h"
+
#include "mpvcore/mp_msg.h"
#include "stream_dvd_common.h"
@@ -104,7 +106,7 @@ void dvd_set_speed(char *device, unsigned speed)
AV_WB16(buffer + 18, 1000);
AV_WB16(buffer + 26, 1000);
- fd = open(device, O_RDWR | O_NONBLOCK);
+ fd = open(device, O_RDWR | O_NONBLOCK | O_CLOEXEC);
if (fd == -1) {
mp_tmsg(MSGT_OPEN, MSGL_INFO, "Couldn't open DVD device for writing, changing DVD speed needs write access.\n");
return;
diff --git a/stream/stream_file.c b/stream/stream_file.c
index b638fdddf0..e72355d387 100644
--- a/stream/stream_file.c
+++ b/stream/stream_file.c
@@ -101,11 +101,11 @@ static int open_f(stream_t *stream, int mode)
};
stream->priv = priv;
- mode_t m = 0;
+ mode_t m = O_CLOEXEC;
if (mode == STREAM_READ)
- m = O_RDONLY;
+ m |= O_RDONLY;
else if (mode == STREAM_WRITE)
- m = O_RDWR | O_CREAT | O_TRUNC;
+ m |= O_RDWR | O_CREAT | O_TRUNC;
else {
mp_msg(MSGT_OPEN, MSGL_ERR, "[file] Unknown open mode %d\n", mode);
return STREAM_UNSUPPORTED;
diff --git a/stream/stream_pvr.c b/stream/stream_pvr.c
index 4f121f0853..a89e70b2c6 100644
--- a/stream/stream_pvr.c
+++ b/stream/stream_pvr.c
@@ -42,6 +42,8 @@
#include <libavutil/common.h>
#include <libavutil/avstring.h>
+#include "osdep/io.h"
+
#include "mpvcore/mp_msg.h"
#include "stream.h"
@@ -1579,7 +1581,7 @@ pvr_stream_open (stream_t *stream, int mode)
parse_encoder_options (pvr);
/* open device */
- pvr->dev_fd = open (pvr->video_dev, O_RDWR);
+ pvr->dev_fd = open (pvr->video_dev, O_RDWR | O_CLOEXEC);
mp_msg (MSGT_OPEN, MSGL_INFO,
"%s Using device %s\n", LOG_LEVEL_PVR, pvr->video_dev);
if (pvr->dev_fd == -1)
diff --git a/stream/stream_radio.c b/stream/stream_radio.c
index 6d07d9738f..5de81c4f90 100644
--- a/stream/stream_radio.c
+++ b/stream/stream_radio.c
@@ -39,11 +39,14 @@
#include <linux/videodev2.h>
#endif
+#include <libavutil/avstring.h>
+
#include "stream.h"
#include "mpvcore/m_option.h"
#include "mpvcore/mp_msg.h"
#include "stream_radio.h"
-#include "libavutil/avstring.h"
+
+#include "osdep/io.h"
#if HAVE_RADIO_CAPTURE
#include "audio_in.h"
@@ -877,7 +880,7 @@ static int open_s(stream_t *stream,int mode)
stream->close=close_s;
stream->fill_buffer=fill_buffer_s;
- priv->radio_fd = open(priv->radio_param->device, O_RDONLY);
+ priv->radio_fd = open(priv->radio_param->device, O_RDONLY | O_CLOEXEC);
if (priv->radio_fd < 0) {
mp_tmsg(MSGT_RADIO, MSGL_ERR, "[radio] Unable to open '%s': %s\n",
priv->radio_param->device, strerror(errno));
diff --git a/stream/stream_vcd.c b/stream/stream_vcd.c
index 4c6dbcc074..0bc7e14f53 100644
--- a/stream/stream_vcd.c
+++ b/stream/stream_vcd.c
@@ -56,6 +56,8 @@
#define vcd_close(priv) (close(((mp_vcd_priv_t*)priv)->fd))
#endif
+#include "osdep/io.h"
+
static int fill_buffer(stream_t *s, char* buffer, int max_len){
if(s->pos > s->end_pos) /// don't past end of current track
return 0;
@@ -112,7 +114,7 @@ static int open_s(stream_t *stream,int mode)
OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL);
f = _open_osfhandle((intptr_t)hd, _O_RDONLY);
#else
- f=open(dev,O_RDONLY);
+ f=open(dev,O_RDONLY | O_CLOEXEC);
#endif
if(f<0){
mp_tmsg(MSGT_OPEN,MSGL_ERR,"CD-ROM Device '%s' not found.\n",dev);