From 62a669d9f04e83debe729347617a935707badc7e Mon Sep 17 00:00:00 2001 From: Chris Rankin Date: Sat, 1 Oct 2011 14:14:27 +0100 Subject: Mark simple file and socket descriptors as uninheritable. This patch creates two utility functions: int open_cloexec(pathname, flags) int create_cloexec(pathname, flags, mode) These return a file descriptor with the CLOEXEC flag set, to ensure that the descriptor is not inherited across a fork/exec operation. The sockets returned by: _x_io_tcp_connect_ipv4() _x_io_tcp_connect() now also have their CLOEXEC flag set. --- src/input/input_cdda.c | 2 +- src/input/input_dvb.c | 14 +++++++------- src/input/input_file.c | 2 +- src/input/input_net.c | 24 ++++++++++++++++++++++++ src/input/input_pvr.c | 10 +++++----- src/input/input_stdin_fifo.c | 2 +- src/input/input_v4l.c | 10 +++++----- src/input/input_vcd.c | 6 +++--- src/input/media_helper.c | 2 +- 9 files changed, 48 insertions(+), 24 deletions(-) (limited to 'src/input') diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index 567f38dd0..00c305ea1 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -1951,7 +1951,7 @@ static int cdda_open(cdda_input_plugin_t *this_gen, /* We use O_NONBLOCK for when /proc/sys/dev/cdrom/check_media is at 1 on * Linux systems */ - fd = open (cdda_device, O_RDONLY | O_NONBLOCK); + fd = open_cloexec(cdda_device, O_RDONLY | O_NONBLOCK); if (fd == -1) { return -1; } diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c index e6abfd3d5..e56c3d260 100644 --- a/src/input/input_dvb.c +++ b/src/input/input_dvb.c @@ -606,7 +606,7 @@ static tuner_t *XINE_MALLOC tuner_init(xine_t * xine, int adapter) snprintf(this->dvr_device,100,"/dev/dvb/adapter%i/dvr0",this->adapter_num); snprintf(video_device,100,"/dev/dvb/adapter%i/video0",this->adapter_num); - if ((this->fd_frontend = open(this->frontend_device, O_RDWR)) < 0) { + if ((this->fd_frontend = open_cloexec(this->frontend_device, O_RDWR)) < 0) { xprintf(this->xine, XINE_VERBOSITY_DEBUG, "FRONTEND DEVICE: %s\n", strerror(errno)); tuner_dispose(this); return NULL; @@ -619,7 +619,7 @@ static tuner_t *XINE_MALLOC tuner_init(xine_t * xine, int adapter) } for (x = 0; x < MAX_FILTERS; x++) { - this->fd_pidfilter[x] = open(this->demux_device, O_RDWR); + this->fd_pidfilter[x] = open_cloexec(this->demux_device, O_RDWR); if (this->fd_pidfilter[x] < 0) { xprintf(this->xine, XINE_VERBOSITY_DEBUG, "DEMUX DEVICE PIDfilter: %s\n", strerror(errno)); tuner_dispose(this); @@ -627,7 +627,7 @@ static tuner_t *XINE_MALLOC tuner_init(xine_t * xine, int adapter) } } for (x = 0; x < MAX_SUBTITLES; x++) { - this->fd_subfilter[x] = open(this->demux_device, O_RDWR); + this->fd_subfilter[x] = open_cloexec(this->demux_device, O_RDWR); if (this->fd_subfilter[x] < 0) { xprintf(this->xine, XINE_VERBOSITY_DEBUG, "DEMUX DEVICE Subtitle filter: %s\n", strerror(errno)); } @@ -2140,7 +2140,7 @@ static int switch_channel(dvb_input_plugin_t *this, int channel) { for (x = 0; x < MAX_FILTERS; x++) { close(this->tuner->fd_pidfilter[x]); - this->tuner->fd_pidfilter[x] = open(this->tuner->demux_device, O_RDWR); + this->tuner->fd_pidfilter[x] = open_cloexec(this->tuner->demux_device, O_RDWR); } if (!tuner_set_channel (this, &this->channels[channel])) { @@ -2174,7 +2174,7 @@ static int switch_channel(dvb_input_plugin_t *this, int channel) { this->channel = channel; - this->fd = open (this->tuner->dvr_device, O_RDONLY | O_NONBLOCK); + this->fd = open_cloexec(this->tuner->dvr_device, O_RDONLY | O_NONBLOCK); this->tuned_in = 1; pthread_mutex_unlock (&this->channel_change_mutex); @@ -2248,7 +2248,7 @@ static void do_record (dvb_input_plugin_t *this) { } /* start recording */ - this->record_fd = open (filename, O_CREAT | O_APPEND | O_WRONLY, 0644); + this->record_fd = create_cloexec(filename, O_APPEND | O_WRONLY, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); this->stream->osd_renderer->clear (this->rec_osd); @@ -2992,7 +2992,7 @@ static int dvb_plugin_open(input_plugin_t * this_gen) return 0; } - if ((this->fd = open(this->tuner->dvr_device, O_RDONLY |O_NONBLOCK)) < 0) { + if ((this->fd = open_cloexec(this->tuner->dvr_device, O_RDONLY |O_NONBLOCK)) < 0) { xprintf(this->class->xine, XINE_VERBOSITY_LOG, _("input_dvb: cannot open dvr device '%s'\n"), this->tuner->dvr_device); return 0; diff --git a/src/input/input_file.c b/src/input/input_file.c index 4a1937390..b8d2b12b7 100644 --- a/src/input/input_file.c +++ b/src/input/input_file.c @@ -362,7 +362,7 @@ static int file_plugin_open (input_plugin_t *this_gen ) { else filename = strdup(this->mrl); /* NEVER unescape plain file names! */ - this->fh = open (filename, O_RDONLY|O_BINARY); + this->fh = open_cloexec(filename, O_RDONLY|O_BINARY); if (this->fh == -1) { if (errno == EACCES) { diff --git a/src/input/input_net.c b/src/input/input_net.c index 55339b2bb..076c11634 100644 --- a/src/input/input_net.c +++ b/src/input/input_net.c @@ -122,6 +122,18 @@ static int host_connect_attempt_ipv4(struct in_addr ia, int port, xine_t *xine) return -1; } +#ifndef WIN32 + if (fcntl(s, F_SETFD, FD_CLOEXEC) < 0) { + xine_log(xine, XINE_LOG_MSG, + _("input_net: Failed to make socket uninheritable (%s)\n"), + strerror(errno)); + } +#else + if (!SetHandleInformation((HANDLE)s, HANDLE_FLAG_INHERIT, 0)) { + xine_log(xine, XINE_LOG_MSG, "Failed to make socket uninheritable\n"); + } +#endif + sin.sin_family = AF_INET; sin.sin_addr = ia; sin.sin_port = htons(port); @@ -152,6 +164,18 @@ static int host_connect_attempt(int family, struct sockaddr* sin, int addrlen, x return -1; } +#ifndef WIN32 + if (fcntl(s, F_SETFD, FD_CLOEXEC) < 0) { + xine_log(xine, XINE_LOG_MSG, + _("input_net: Failed to make socket uninheritable (%s)\n"), + strerror(errno)); + } +#else + if (!SetHandleInformation((HANDLE)s, HANDLE_FLAG_INHERIT, 0)) { + xine_log(xine, XINE_LOG_MSG, "Failed to make socket uninheritable\n"); + } +#endif + #ifndef WIN32 if (connect(s, sin, addrlen)==-1 && errno != EINPROGRESS) #else diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c index 5e7f7bca9..7ccad806e 100644 --- a/src/input/input_pvr.c +++ b/src/input/input_pvr.c @@ -583,7 +583,7 @@ static int pvr_break_rec_page (pvr_input_plugin_t *this) { lprintf("opening pvr file for writing (%s)\n", filename); - this->rec_fd = open(filename, O_RDWR | O_CREAT | O_TRUNC, 0666 ); + this->rec_fd = create_cloexec(filename, O_RDWR | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); if( this->rec_fd == -1 ) { xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("input_pvr: error creating pvr file (%s)\n"), filename); @@ -740,7 +740,7 @@ static int pvr_play_file(pvr_input_plugin_t *this, fifo_buffer_t *fifo, uint8_t lprintf("opening pvr file for reading (%s)\n", filename); - this->play_fd = open(filename, O_RDONLY ); + this->play_fd = open_cloexec(filename, O_RDONLY); if( this->play_fd == -1 ) { xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("input_pvr: error opening pvr file (%s)\n"), filename); @@ -1008,7 +1008,7 @@ static void pvr_event_handler (pvr_input_plugin_t *this) { /* as of ivtv 0.10.6: must close and reopen to set input */ close(this->dev_fd); - this->dev_fd = open (this->class->devname, O_RDWR); + this->dev_fd = open_cloexec(this->class->devname, O_RDWR); if (this->dev_fd < 0) { xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "input_pvr: error opening device %s\n", this->class->devname ); @@ -1155,7 +1155,7 @@ static void pvr_event_handler (pvr_input_plugin_t *this) { /* how lame. we must close and reopen to change bitrate. */ close(this->dev_fd); - this->dev_fd = open (this->class->devname, O_RDWR); + this->dev_fd = open_cloexec(this->class->devname, O_RDWR); if (this->dev_fd == -1) { xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("input_pvr: error opening device %s\n"), this->class->devname ); @@ -1415,7 +1415,7 @@ static int pvr_plugin_open (input_plugin_t *this_gen ) { this->saved_id = 0; - this->dev_fd = open (this->class->devname, O_RDWR); + this->dev_fd = open_cloexec(this->class->devname, O_RDWR); if (this->dev_fd == -1) { xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("input_pvr: error opening device %s\n"), this->class->devname ); diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c index 74f2a1014..c73488722 100644 --- a/src/input/input_stdin_fifo.c +++ b/src/input/input_stdin_fifo.c @@ -253,7 +253,7 @@ static int stdin_plugin_open (input_plugin_t *this_gen ) { char *filename; filename = (char *) &this->mrl[5]; - this->fh = open (filename, FILE_FLAGS); + this->fh = open_cloexec(filename, FILE_FLAGS); lprintf("filename '%s'\n", filename); diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c index e3af41f85..68ed44b9c 100644 --- a/src/input/input_v4l.c +++ b/src/input/input_v4l.c @@ -797,7 +797,7 @@ static int open_radio_capture_device(v4l_input_plugin_t *this) entry = this->stream->xine->config->lookup_entry(this->stream->xine->config, "media.video4linux.radio_device"); - if((this->radio_fd = open(entry->str_value, O_RDWR)) < 0) { + if((this->radio_fd = open_cloexec(entry->str_value, O_RDWR)) < 0) { xprintf(this->stream->xine, XINE_VERBOSITY_LOG, "input_v4l: error opening v4l device (%s): %s\n", entry->str_value, strerror(errno)); @@ -850,7 +850,7 @@ static int open_video_capture_device(v4l_input_plugin_t *this) "media.video4linux.video_device"); /* Try to open the video device */ - if((this->video_fd = open(entry->str_value, O_RDWR)) < 0) { + if((this->video_fd = open_cloexec(entry->str_value, O_RDWR)) < 0) { xprintf(this->stream->xine, XINE_VERBOSITY_LOG, "input_v4l: error opening v4l device (%s): %s\n", entry->str_value, strerror(errno)); @@ -1539,7 +1539,7 @@ static void v4l_plugin_dispose (input_plugin_t *this_gen) { if (this->tuner_name) free(this->tuner_name); - /* Close video device only if device was openend */ + /* Close video device only if device was opened */ if (this->video_fd > 0) { /* Restore v4l audio volume */ @@ -1770,7 +1770,7 @@ static input_plugin_t *v4l_class_get_video_instance (input_class_t *cls_gen, "media.video4linux.video_device"); /* Try to open the video device */ - if((this->video_fd = open(entry->str_value, O_RDWR)) < 0) { + if((this->video_fd = open_cloexec(entry->str_value, O_RDWR)) < 0) { xprintf(this->stream->xine, XINE_VERBOSITY_LOG, "input_v4l: error opening v4l device (%s): %s\n", entry->str_value, strerror(errno)); @@ -1833,7 +1833,7 @@ static input_plugin_t *v4l_class_get_radio_instance (input_class_t *cls_gen, entry = this->stream->xine->config->lookup_entry(this->stream->xine->config, "media.video4linux.radio_device"); - if((this->radio_fd = open(entry->str_value, O_RDWR)) < 0) { + if((this->radio_fd = open_cloexec(entry->str_value, O_RDWR)) < 0) { xprintf(this->stream->xine, XINE_VERBOSITY_LOG, "input_v4l: error opening v4l device (%s): %s\n", entry->str_value, strerror(errno)); diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c index 7000778b7..1da5b2839 100644 --- a/src/input/input_vcd.c +++ b/src/input/input_vcd.c @@ -829,7 +829,7 @@ static int vcd_plugin_open (input_plugin_t *this_gen) { char *filename; int fd; - fd = open (cls->device, O_RDONLY|O_EXCL); + fd = open_cloexec(cls->device, O_RDONLY|O_EXCL); if (fd == -1) { return 0; } @@ -972,7 +972,7 @@ static xine_mrl_t **vcd_class_get_dir (input_class_t *this_gen, const char *file return NULL; - fd = open (this->device, O_RDONLY|O_EXCL); + fd = open_cloexec(this->device, O_RDONLY|O_EXCL); if (fd == -1) { xprintf (this->xine, XINE_VERBOSITY_LOG, @@ -1034,7 +1034,7 @@ static char ** vcd_class_get_autoplay_list (input_class_t *this_gen, int *num_fi int i, fd; - fd = open (this->device, O_RDONLY|O_EXCL); + fd = open_cloexec(this->device, O_RDONLY|O_EXCL); if (fd == -1) { xprintf (this->xine, XINE_VERBOSITY_LOG, diff --git a/src/input/media_helper.c b/src/input/media_helper.c index e19ca63e6..616793499 100644 --- a/src/input/media_helper.c +++ b/src/input/media_helper.c @@ -99,7 +99,7 @@ int media_eject_media (xine_t *xine, const char *device) media_umount_media(device); /* printf("input_dvd: umount result: %s\n", strerror(errno)); */ - if ((fd = open (device, O_RDONLY|O_NONBLOCK)) > -1) { + if ((fd = open_cloexec(device, O_RDONLY|O_NONBLOCK)) > -1) { #if defined (__linux__) int ret, status; -- cgit v1.2.3 From 5ec743f4ddf302d10b3547cfc18ae0ca8aed1edd Mon Sep 17 00:00:00 2001 From: Chris Rankin Date: Mon, 3 Oct 2011 01:58:22 +0100 Subject: Add CLOEXEC to another descriptor. (Merge from 1.2 branch). --- src/input/input_dvb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/input') diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c index e56c3d260..cae56d301 100644 --- a/src/input/input_dvb.c +++ b/src/input/input_dvb.c @@ -648,7 +648,7 @@ static tuner_t *XINE_MALLOC tuner_init(xine_t * xine, int adapter) if(this->feinfo.type==FE_OFDM) xprintf(this->xine,XINE_VERBOSITY_DEBUG,"TER Card\n"); if(this->feinfo.type==FE_ATSC) xprintf(this->xine,XINE_VERBOSITY_DEBUG,"US Card\n"); - if ((test_video=open(video_device, O_RDWR)) < 0) { + if ((test_video=open_cloexec(video_device, O_RDWR)) < 0) { xprintf(this->xine,XINE_VERBOSITY_DEBUG,"input_dvb: Card has no hardware decoder\n"); }else{ xprintf(this->xine,XINE_VERBOSITY_DEBUG,"input_dvb: Card HAS HARDWARE DECODER\n"); -- cgit v1.2.3 From 5db268a002e7a102855e84a3ff5e1c27ca7cb927 Mon Sep 17 00:00:00 2001 From: Chris Rankin Date: Mon, 3 Oct 2011 12:11:56 +0100 Subject: Prefix open_cloexec() and create_cloexec() with xine_, and add new xine_socket_cloexec() function. --- src/input/input_cdda.c | 2 +- src/input/input_dvb.c | 16 ++++++++-------- src/input/input_file.c | 2 +- src/input/input_net.c | 31 +++---------------------------- src/input/input_pvr.c | 10 +++++----- src/input/input_stdin_fifo.c | 6 +++--- src/input/input_v4l.c | 8 ++++---- src/input/input_vcd.c | 6 +++--- src/input/media_helper.c | 2 +- 9 files changed, 29 insertions(+), 54 deletions(-) (limited to 'src/input') diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index 00c305ea1..052a1b257 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -1951,7 +1951,7 @@ static int cdda_open(cdda_input_plugin_t *this_gen, /* We use O_NONBLOCK for when /proc/sys/dev/cdrom/check_media is at 1 on * Linux systems */ - fd = open_cloexec(cdda_device, O_RDONLY | O_NONBLOCK); + fd = xine_open_cloexec(cdda_device, O_RDONLY | O_NONBLOCK); if (fd == -1) { return -1; } diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c index cae56d301..fc6e2b7c4 100644 --- a/src/input/input_dvb.c +++ b/src/input/input_dvb.c @@ -606,7 +606,7 @@ static tuner_t *XINE_MALLOC tuner_init(xine_t * xine, int adapter) snprintf(this->dvr_device,100,"/dev/dvb/adapter%i/dvr0",this->adapter_num); snprintf(video_device,100,"/dev/dvb/adapter%i/video0",this->adapter_num); - if ((this->fd_frontend = open_cloexec(this->frontend_device, O_RDWR)) < 0) { + if ((this->fd_frontend = xine_open_cloexec(this->frontend_device, O_RDWR)) < 0) { xprintf(this->xine, XINE_VERBOSITY_DEBUG, "FRONTEND DEVICE: %s\n", strerror(errno)); tuner_dispose(this); return NULL; @@ -619,7 +619,7 @@ static tuner_t *XINE_MALLOC tuner_init(xine_t * xine, int adapter) } for (x = 0; x < MAX_FILTERS; x++) { - this->fd_pidfilter[x] = open_cloexec(this->demux_device, O_RDWR); + this->fd_pidfilter[x] = xine_open_cloexec(this->demux_device, O_RDWR); if (this->fd_pidfilter[x] < 0) { xprintf(this->xine, XINE_VERBOSITY_DEBUG, "DEMUX DEVICE PIDfilter: %s\n", strerror(errno)); tuner_dispose(this); @@ -627,7 +627,7 @@ static tuner_t *XINE_MALLOC tuner_init(xine_t * xine, int adapter) } } for (x = 0; x < MAX_SUBTITLES; x++) { - this->fd_subfilter[x] = open_cloexec(this->demux_device, O_RDWR); + this->fd_subfilter[x] = xine_open_cloexec(this->demux_device, O_RDWR); if (this->fd_subfilter[x] < 0) { xprintf(this->xine, XINE_VERBOSITY_DEBUG, "DEMUX DEVICE Subtitle filter: %s\n", strerror(errno)); } @@ -648,7 +648,7 @@ static tuner_t *XINE_MALLOC tuner_init(xine_t * xine, int adapter) if(this->feinfo.type==FE_OFDM) xprintf(this->xine,XINE_VERBOSITY_DEBUG,"TER Card\n"); if(this->feinfo.type==FE_ATSC) xprintf(this->xine,XINE_VERBOSITY_DEBUG,"US Card\n"); - if ((test_video=open_cloexec(video_device, O_RDWR)) < 0) { + if ((test_video=xine_open_cloexec(video_device, O_RDWR)) < 0) { xprintf(this->xine,XINE_VERBOSITY_DEBUG,"input_dvb: Card has no hardware decoder\n"); }else{ xprintf(this->xine,XINE_VERBOSITY_DEBUG,"input_dvb: Card HAS HARDWARE DECODER\n"); @@ -2140,7 +2140,7 @@ static int switch_channel(dvb_input_plugin_t *this, int channel) { for (x = 0; x < MAX_FILTERS; x++) { close(this->tuner->fd_pidfilter[x]); - this->tuner->fd_pidfilter[x] = open_cloexec(this->tuner->demux_device, O_RDWR); + this->tuner->fd_pidfilter[x] = xine_open_cloexec(this->tuner->demux_device, O_RDWR); } if (!tuner_set_channel (this, &this->channels[channel])) { @@ -2174,7 +2174,7 @@ static int switch_channel(dvb_input_plugin_t *this, int channel) { this->channel = channel; - this->fd = open_cloexec(this->tuner->dvr_device, O_RDONLY | O_NONBLOCK); + this->fd = xine_open_cloexec(this->tuner->dvr_device, O_RDONLY | O_NONBLOCK); this->tuned_in = 1; pthread_mutex_unlock (&this->channel_change_mutex); @@ -2248,7 +2248,7 @@ static void do_record (dvb_input_plugin_t *this) { } /* start recording */ - this->record_fd = create_cloexec(filename, O_APPEND | O_WRONLY, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); + this->record_fd = xine_create_cloexec(filename, O_APPEND | O_WRONLY, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); this->stream->osd_renderer->clear (this->rec_osd); @@ -2992,7 +2992,7 @@ static int dvb_plugin_open(input_plugin_t * this_gen) return 0; } - if ((this->fd = open_cloexec(this->tuner->dvr_device, O_RDONLY |O_NONBLOCK)) < 0) { + if ((this->fd = xine_open_cloexec(this->tuner->dvr_device, O_RDONLY |O_NONBLOCK)) < 0) { xprintf(this->class->xine, XINE_VERBOSITY_LOG, _("input_dvb: cannot open dvr device '%s'\n"), this->tuner->dvr_device); return 0; diff --git a/src/input/input_file.c b/src/input/input_file.c index b8d2b12b7..d5313d4dc 100644 --- a/src/input/input_file.c +++ b/src/input/input_file.c @@ -362,7 +362,7 @@ static int file_plugin_open (input_plugin_t *this_gen ) { else filename = strdup(this->mrl); /* NEVER unescape plain file names! */ - this->fh = open_cloexec(filename, O_RDONLY|O_BINARY); + this->fh = xine_open_cloexec(filename, O_RDONLY|O_BINARY); if (this->fh == -1) { if (errno == EACCES) { diff --git a/src/input/input_net.c b/src/input/input_net.c index 076c11634..5c927a6d5 100644 --- a/src/input/input_net.c +++ b/src/input/input_net.c @@ -115,25 +115,13 @@ static int host_connect_attempt_ipv4(struct in_addr ia, int port, xine_t *xine) int s; struct sockaddr_in sin; - s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); + s = xine_socket_cloexec(PF_INET, SOCK_STREAM, IPPROTO_TCP); if (s==-1) { xine_log(xine, XINE_LOG_MSG, _("input_net: socket(): %s\n"), strerror(errno)); return -1; } -#ifndef WIN32 - if (fcntl(s, F_SETFD, FD_CLOEXEC) < 0) { - xine_log(xine, XINE_LOG_MSG, - _("input_net: Failed to make socket uninheritable (%s)\n"), - strerror(errno)); - } -#else - if (!SetHandleInformation((HANDLE)s, HANDLE_FLAG_INHERIT, 0)) { - xine_log(xine, XINE_LOG_MSG, "Failed to make socket uninheritable\n"); - } -#endif - sin.sin_family = AF_INET; sin.sin_addr = ia; sin.sin_port = htons(port); @@ -155,27 +143,14 @@ static int host_connect_attempt_ipv4(struct in_addr ia, int port, xine_t *xine) #else static int host_connect_attempt(int family, struct sockaddr* sin, int addrlen, xine_t *xine) { - int s; + int s = xine_socket_cloexec(family, SOCK_STREAM, IPPROTO_TCP); - s = socket(family, SOCK_STREAM, IPPROTO_TCP); - if (s==-1) { + if (s == -1) { xine_log(xine, XINE_LOG_MSG, _("input_net: socket(): %s\n"), strerror(errno)); return -1; } -#ifndef WIN32 - if (fcntl(s, F_SETFD, FD_CLOEXEC) < 0) { - xine_log(xine, XINE_LOG_MSG, - _("input_net: Failed to make socket uninheritable (%s)\n"), - strerror(errno)); - } -#else - if (!SetHandleInformation((HANDLE)s, HANDLE_FLAG_INHERIT, 0)) { - xine_log(xine, XINE_LOG_MSG, "Failed to make socket uninheritable\n"); - } -#endif - #ifndef WIN32 if (connect(s, sin, addrlen)==-1 && errno != EINPROGRESS) #else diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c index 7ccad806e..875fb84b0 100644 --- a/src/input/input_pvr.c +++ b/src/input/input_pvr.c @@ -583,7 +583,7 @@ static int pvr_break_rec_page (pvr_input_plugin_t *this) { lprintf("opening pvr file for writing (%s)\n", filename); - this->rec_fd = create_cloexec(filename, O_RDWR | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); + this->rec_fd = xine_create_cloexec(filename, O_RDWR | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); if( this->rec_fd == -1 ) { xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("input_pvr: error creating pvr file (%s)\n"), filename); @@ -740,7 +740,7 @@ static int pvr_play_file(pvr_input_plugin_t *this, fifo_buffer_t *fifo, uint8_t lprintf("opening pvr file for reading (%s)\n", filename); - this->play_fd = open_cloexec(filename, O_RDONLY); + this->play_fd = xine_open_cloexec(filename, O_RDONLY); if( this->play_fd == -1 ) { xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("input_pvr: error opening pvr file (%s)\n"), filename); @@ -1008,7 +1008,7 @@ static void pvr_event_handler (pvr_input_plugin_t *this) { /* as of ivtv 0.10.6: must close and reopen to set input */ close(this->dev_fd); - this->dev_fd = open_cloexec(this->class->devname, O_RDWR); + this->dev_fd = xine_open_cloexec(this->class->devname, O_RDWR); if (this->dev_fd < 0) { xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "input_pvr: error opening device %s\n", this->class->devname ); @@ -1155,7 +1155,7 @@ static void pvr_event_handler (pvr_input_plugin_t *this) { /* how lame. we must close and reopen to change bitrate. */ close(this->dev_fd); - this->dev_fd = open_cloexec(this->class->devname, O_RDWR); + this->dev_fd = xine_open_cloexec(this->class->devname, O_RDWR); if (this->dev_fd == -1) { xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("input_pvr: error opening device %s\n"), this->class->devname ); @@ -1415,7 +1415,7 @@ static int pvr_plugin_open (input_plugin_t *this_gen ) { this->saved_id = 0; - this->dev_fd = open_cloexec(this->class->devname, O_RDWR); + this->dev_fd = xine_open_cloexec(this->class->devname, O_RDWR); if (this->dev_fd == -1) { xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("input_pvr: error opening device %s\n"), this->class->devname ); diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c index c73488722..d3a2e83e1 100644 --- a/src/input/input_stdin_fifo.c +++ b/src/input/input_stdin_fifo.c @@ -250,10 +250,10 @@ static int stdin_plugin_open (input_plugin_t *this_gen ) { lprintf ("trying to open '%s'...\n", this->mrl); if (this->fh == -1) { - char *filename; + const char *filename; - filename = (char *) &this->mrl[5]; - this->fh = open_cloexec(filename, FILE_FLAGS); + filename = (const char *) &this->mrl[5]; + this->fh = xine_open_cloexec(filename, FILE_FLAGS); lprintf("filename '%s'\n", filename); diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c index 68ed44b9c..b88c4821d 100644 --- a/src/input/input_v4l.c +++ b/src/input/input_v4l.c @@ -797,7 +797,7 @@ static int open_radio_capture_device(v4l_input_plugin_t *this) entry = this->stream->xine->config->lookup_entry(this->stream->xine->config, "media.video4linux.radio_device"); - if((this->radio_fd = open_cloexec(entry->str_value, O_RDWR)) < 0) { + if((this->radio_fd = xine_open_cloexec(entry->str_value, O_RDWR)) < 0) { xprintf(this->stream->xine, XINE_VERBOSITY_LOG, "input_v4l: error opening v4l device (%s): %s\n", entry->str_value, strerror(errno)); @@ -850,7 +850,7 @@ static int open_video_capture_device(v4l_input_plugin_t *this) "media.video4linux.video_device"); /* Try to open the video device */ - if((this->video_fd = open_cloexec(entry->str_value, O_RDWR)) < 0) { + if((this->video_fd = xine_open_cloexec(entry->str_value, O_RDWR)) < 0) { xprintf(this->stream->xine, XINE_VERBOSITY_LOG, "input_v4l: error opening v4l device (%s): %s\n", entry->str_value, strerror(errno)); @@ -1770,7 +1770,7 @@ static input_plugin_t *v4l_class_get_video_instance (input_class_t *cls_gen, "media.video4linux.video_device"); /* Try to open the video device */ - if((this->video_fd = open_cloexec(entry->str_value, O_RDWR)) < 0) { + if((this->video_fd = xine_open_cloexec(entry->str_value, O_RDWR)) < 0) { xprintf(this->stream->xine, XINE_VERBOSITY_LOG, "input_v4l: error opening v4l device (%s): %s\n", entry->str_value, strerror(errno)); @@ -1833,7 +1833,7 @@ static input_plugin_t *v4l_class_get_radio_instance (input_class_t *cls_gen, entry = this->stream->xine->config->lookup_entry(this->stream->xine->config, "media.video4linux.radio_device"); - if((this->radio_fd = open_cloexec(entry->str_value, O_RDWR)) < 0) { + if((this->radio_fd = xine_open_cloexec(entry->str_value, O_RDWR)) < 0) { xprintf(this->stream->xine, XINE_VERBOSITY_LOG, "input_v4l: error opening v4l device (%s): %s\n", entry->str_value, strerror(errno)); diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c index 1da5b2839..20bf8c845 100644 --- a/src/input/input_vcd.c +++ b/src/input/input_vcd.c @@ -829,7 +829,7 @@ static int vcd_plugin_open (input_plugin_t *this_gen) { char *filename; int fd; - fd = open_cloexec(cls->device, O_RDONLY|O_EXCL); + fd = xine_open_cloexec(cls->device, O_RDONLY|O_EXCL); if (fd == -1) { return 0; } @@ -972,7 +972,7 @@ static xine_mrl_t **vcd_class_get_dir (input_class_t *this_gen, const char *file return NULL; - fd = open_cloexec(this->device, O_RDONLY|O_EXCL); + fd = xine_open_cloexec(this->device, O_RDONLY|O_EXCL); if (fd == -1) { xprintf (this->xine, XINE_VERBOSITY_LOG, @@ -1034,7 +1034,7 @@ static char ** vcd_class_get_autoplay_list (input_class_t *this_gen, int *num_fi int i, fd; - fd = open_cloexec(this->device, O_RDONLY|O_EXCL); + fd = xine_open_cloexec(this->device, O_RDONLY|O_EXCL); if (fd == -1) { xprintf (this->xine, XINE_VERBOSITY_LOG, diff --git a/src/input/media_helper.c b/src/input/media_helper.c index 616793499..1a82a406c 100644 --- a/src/input/media_helper.c +++ b/src/input/media_helper.c @@ -99,7 +99,7 @@ int media_eject_media (xine_t *xine, const char *device) media_umount_media(device); /* printf("input_dvd: umount result: %s\n", strerror(errno)); */ - if ((fd = open_cloexec(device, O_RDONLY|O_NONBLOCK)) > -1) { + if ((fd = xine_open_cloexec(device, O_RDONLY|O_NONBLOCK)) > -1) { #if defined (__linux__) int ret, status; -- cgit v1.2.3 From fa660f82ae5889b931c645133abb151f26fba343 Mon Sep 17 00:00:00 2001 From: Chris Rankin Date: Mon, 3 Oct 2011 21:07:39 +0100 Subject: Set CLOEXEC flag on three more sockets. There are two functions that actually set this flag: int _x_set_file_close_on_exec() int _x_set_socket_close_on_exec() (We need two functions because file descriptors and sockets are not the same under WIN32 - of course). These function have been assigned "internal" visibility so that they can be used throughout libxine.so itself while still not being exported to the global symbol table. In other words, they're both as close to being "static" as I can make them. --- src/input/input_rtp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/input') diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c index e91e43f55..a7102fccd 100644 --- a/src/input/input_rtp.c +++ b/src/input/input_rtp.c @@ -171,7 +171,7 @@ typedef struct { static int host_connect_attempt(struct in_addr ia, int port, const char *interface, xine_t *xine) { - int s=socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP); + int s = xine_socket_cloexec(PF_INET, SOCK_DGRAM, IPPROTO_UDP); union { struct sockaddr_in in; struct sockaddr sa; @@ -180,7 +180,7 @@ static int host_connect_attempt(struct in_addr ia, int port, int multicast = 0; /* boolean, assume unicast */ if(s == -1) { - LOG_MSG(xine, _("socket(): %s.\n"), strerror(errno)); + LOG_MSG(xine, _("xine_socket_cloexec(): %s.\n"), strerror(errno)); return -1; } -- cgit v1.2.3