Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / um / os-Linux / drivers / tuntap_user.c

diff --git a/arch/um/os-Linux/drivers/tuntap_user.c b/arch/um/os-Linux/drivers/tuntap_user.c
index c858f11..87c3aa0 100644 (file)
--- a/arch/um/os-Linux/drivers/tuntap_user.c
+++ b/arch/um/os-Linux/drivers/tuntap_user.c
@@ -8,7 +8,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
-#include <fcntl.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
 #include <sys/un.h>
@@ -19,8 +18,8 @@
 #include "net_user.h"
 #include "tuntap.h"
 #include "kern_util.h"
+#include "user_util.h"
 #include "user.h"
-#include "helper.h"
 #include "os.h"
 
 #define MAX_PACKET ETH_MAX_PACKET
@@ -61,7 +60,7 @@ static void tuntap_pre_exec(void *arg)
        struct tuntap_pre_exec_data *data = arg;
        
        dup2(data->stdout, 1);
-       close(data->close_me);
+       os_close_file(data->close_me);
 }
 
 static int tuntap_open_tramp(char *gate, int *fd_out, int me, int remote,
@@ -75,7 +74,7 @@ static int tuntap_open_tramp(char *gate, int *fd_out, int me, int remote,
        struct msghdr msg;
        struct cmsghdr *cmsg;
        struct iovec iov;
-       int pid, n;
+       int pid, n, err;
 
        sprintf(version_buf, "%d", UML_NET_VERSION);
 
@@ -86,7 +85,7 @@ static int tuntap_open_tramp(char *gate, int *fd_out, int me, int remote,
 
        if(pid < 0) return(-pid);
 
-       close(remote);
+       os_close_file(remote);
 
        msg.msg_name = NULL;
        msg.msg_namelen = 0;
@@ -105,23 +104,25 @@ static int tuntap_open_tramp(char *gate, int *fd_out, int me, int remote,
        n = recvmsg(me, &msg, 0);
        *used_out = n;
        if(n < 0){
+               err = -errno;
                printk("tuntap_open_tramp : recvmsg failed - errno = %d\n", 
                       errno);
-               return(errno);
+               return err;
        }
-       waitpid(pid, NULL, 0);
+       CATCH_EINTR(waitpid(pid, NULL, 0));
 
        cmsg = CMSG_FIRSTHDR(&msg);
        if(cmsg == NULL){
                printk("tuntap_open_tramp : didn't receive a message\n");
-               return(EINVAL);
+               return(-EINVAL);
        }
        if((cmsg->cmsg_level != SOL_SOCKET) || 
           (cmsg->cmsg_type != SCM_RIGHTS)){
                printk("tuntap_open_tramp : didn't receive a descriptor\n");
-               return(EINVAL);
+               return(-EINVAL);
        }
        *fd_out = ((int *) CMSG_DATA(cmsg))[0];
+       os_set_exec_close(*fd_out, 1);
        return(0);
 }
 
@@ -133,27 +134,31 @@ static int tuntap_open(void *data)
        int err, fds[2], len, used;
 
        err = tap_open_common(pri->dev, pri->gate_addr);
-       if(err) return(err);
+       if(err < 0)
+               return(err);
 
        if(pri->fixed_config){
-               if((pri->fd = open("/dev/net/tun", O_RDWR)) < 0){
-                       printk("Failed to open /dev/net/tun, errno = %d\n",
-                              errno);
-                       return(-errno);
+               pri->fd = os_open_file("/dev/net/tun",
+                                      of_cloexec(of_rdwr(OPENFLAGS())), 0);
+               if(pri->fd < 0){
+                       printk("Failed to open /dev/net/tun, err = %d\n",
+                              -pri->fd);
+                       return(pri->fd);
                }
                memset(&ifr, 0, sizeof(ifr));
-               ifr.ifr_flags = IFF_TAP;
+               ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
                strlcpy(ifr.ifr_name, pri->dev_name, sizeof(ifr.ifr_name));
                if(ioctl(pri->fd, TUNSETIFF, (void *) &ifr) < 0){
-                       printk("TUNSETIFF failed, errno = %d", errno);
-                       close(pri->fd);
-                       return(-errno);
+                       err = -errno;
+                       printk("TUNSETIFF failed, errno = %d\n", errno);
+                       os_close_file(pri->fd);
+                       return err;
                }
        }
        else {
                err = os_pipe(fds, 0, 0);
-               if(err){
-                       printk("tuntap_open : os_pipe failed - errno = %d\n",
+               if(err < 0){
+                       printk("tuntap_open : os_pipe failed - err = %d\n",
                               -err);
                        return(err);
                }
@@ -166,19 +171,19 @@ static int tuntap_open(void *data)
                                        fds[1], buffer, len, &used);
 
                output = buffer;
-               if(err == 0){
-                       pri->dev_name = uml_strdup(buffer);
-                       output += IFNAMSIZ;
-                       printk(output);
+               if(err < 0) {
+                       printk("%s", output);
                        free_output_buffer(buffer);
+                       printk("tuntap_open_tramp failed - err = %d\n", -err);
+                       return(err);
                }
-               else {
-                       printk(output);
-                       free_output_buffer(buffer);
-                       printk("tuntap_open_tramp failed - errno = %d\n", err);
-                       return(-err);
-               }
-               close(fds[0]);
+
+               pri->dev_name = uml_strdup(buffer);
+               output += IFNAMSIZ;
+               printk("%s", output);
+               free_output_buffer(buffer);
+
+               os_close_file(fds[0]);
                iter_addresses(pri->dev, open_addr, pri->dev_name);
        }
 
@@ -191,7 +196,7 @@ static void tuntap_close(int fd, void *data)
 
        if(!pri->fixed_config) 
                iter_addresses(pri->dev, close_addr, pri->dev_name);
-       close(fd);
+       os_close_file(fd);
        pri->fd = -1;
 }