git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
um
/
drivers
/
port_user.c
diff --git
a/arch/um/drivers/port_user.c
b/arch/um/drivers/port_user.c
index
7a37cf6
..
996e817
100644
(file)
--- a/
arch/um/drivers/port_user.c
+++ b/
arch/um/drivers/port_user.c
@@
-47,10
+47,12
@@
void *port_init(char *str, int device, struct chan_opts *opts)
return(NULL);
}
return(NULL);
}
- if((kern_data = port_data(port)) == NULL)
+ kern_data = port_data(port);
+ if(kern_data == NULL)
return(NULL);
return(NULL);
- if((data = um_kmalloc(sizeof(*data))) == NULL)
+ data = um_kmalloc(sizeof(*data));
+ if(data == NULL)
goto err;
*data = ((struct port_chan) { .raw = opts->raw,
goto err;
*data = ((struct port_chan) { .raw = opts->raw,
@@
-74,12
+76,17
@@
void port_free(void *d)
int port_open(int input, int output, int primary, void *d, char **dev_out)
{
struct port_chan *data = d;
int port_open(int input, int output, int primary, void *d, char **dev_out)
{
struct port_chan *data = d;
- int fd;
+ int fd
, err
;
fd = port_wait(data->kernel_data);
if((fd >= 0) && data->raw){
fd = port_wait(data->kernel_data);
if((fd >= 0) && data->raw){
- tcgetattr(fd, &data->tt);
- raw(fd, 0);
+ CATCH_EINTR(err = tcgetattr(fd, &data->tt));
+ if(err)
+ return(err);
+
+ err = raw(fd);
+ if(err)
+ return(err);
}
*dev_out = data->dev;
return(fd);
}
*dev_out = data->dev;
return(fd);
@@
-90,7
+97,7
@@
void port_close(int fd, void *d)
struct port_chan *data = d;
port_remove_dev(data->kernel_data);
struct port_chan *data = d;
port_remove_dev(data->kernel_data);
-
clos
e(fd);
+
os_close_fil
e(fd);
}
int port_console_write(int fd, const char *buf, int n, void *d)
}
int port_console_write(int fd, const char *buf, int n, void *d)
@@
-116,12
+123,18
@@
struct chan_ops port_ops = {
int port_listen_fd(int port)
{
struct sockaddr_in addr;
int port_listen_fd(int port)
{
struct sockaddr_in addr;
- int fd, err;
+ int fd, err
, arg
;
fd = socket(PF_INET, SOCK_STREAM, 0);
if(fd == -1)
return(-errno);
fd = socket(PF_INET, SOCK_STREAM, 0);
if(fd == -1)
return(-errno);
+ arg = 1;
+ if(setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &arg, sizeof(arg)) < 0){
+ err = -errno;
+ goto out;
+ }
+
addr.sin_family = AF_INET;
addr.sin_port = htons(port);
addr.sin_addr.s_addr = htonl(INADDR_ANY);
addr.sin_family = AF_INET;
addr.sin_port = htons(port);
addr.sin_addr.s_addr = htonl(INADDR_ANY);
@@
-130,11
+143,15
@@
int port_listen_fd(int port)
goto out;
}
goto out;
}
- if(
(listen(fd, 1) < 0) || (os_set_fd_block(fd, 0))
){
+ if(
listen(fd, 1) < 0
){
err = -errno;
goto out;
}
err = -errno;
goto out;
}
+ err = os_set_fd_block(fd, 0);
+ if(err < 0)
+ goto out;
+
return(fd);
out:
os_close_file(fd);
return(fd);
out:
os_close_file(fd);
@@
-153,10
+170,10
@@
void port_pre_exec(void *arg)
dup2(data->sock_fd, 0);
dup2(data->sock_fd, 1);
dup2(data->sock_fd, 2);
dup2(data->sock_fd, 0);
dup2(data->sock_fd, 1);
dup2(data->sock_fd, 2);
-
clos
e(data->sock_fd);
+
os_close_fil
e(data->sock_fd);
dup2(data->pipe_fd, 3);
os_shutdown_socket(3, 1, 0);
dup2(data->pipe_fd, 3);
os_shutdown_socket(3, 1, 0);
-
clos
e(data->pipe_fd);
+
os_close_fil
e(data->pipe_fd);
}
int port_connection(int fd, int *socket, int *pid_out)
}
int port_connection(int fd, int *socket, int *pid_out)
@@
-166,11
+183,12
@@
int port_connection(int fd, int *socket, int *pid_out)
"/usr/lib/uml/port-helper", NULL };
struct port_pre_exec_data data;
"/usr/lib/uml/port-helper", NULL };
struct port_pre_exec_data data;
- if((new = os_accept_connection(fd)) < 0)
- return(-errno);
+ new = os_accept_connection(fd);
+ if(new < 0)
+ return(new);
err = os_pipe(socket, 0, 0);
err = os_pipe(socket, 0, 0);
- if(err
)
+ if(err
< 0)
goto out_close;
data = ((struct port_pre_exec_data)
goto out_close;
data = ((struct port_pre_exec_data)
@@
-186,11
+204,11
@@
int port_connection(int fd, int *socket, int *pid_out)
out_shutdown:
os_shutdown_socket(socket[0], 1, 1);
out_shutdown:
os_shutdown_socket(socket[0], 1, 1);
-
clos
e(socket[0]);
+
os_close_fil
e(socket[0]);
os_shutdown_socket(socket[1], 1, 1);
os_shutdown_socket(socket[1], 1, 1);
-
clos
e(socket[1]);
+
os_close_fil
e(socket[1]);
out_close:
out_close:
-
clos
e(new);
+
os_close_fil
e(new);
return(err);
}
return(err);
}