b4fd310e16
The poster child for this patch is the third tuntap_user hunk. When an ioctl fails, it properly closes the opened file descriptor and returns. However, the close resets errno to 0, and the 'return errno' that follows returns 0 rather than the value that ioctl set. This caused the caller to believe that the device open succeeded and had opened file descriptor 0, which caused no end of interesting behavior. The rest of this patch is a pass through the UML sources looking for places where errno could be reset before being passed back out. A common culprit is printk, which could call write, being called before errno is returned. In some cases, where the code ends up being much smaller, I just deleted the printk. There was another case where a caller of run_helper looked at errno after a failure, rather than the return value of run_helper, which was the errno value that it wanted. Signed-off-by: Jeff Dike <jdike@addtoit.com> Cc: Paolo Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
164 lines
3.4 KiB
C
164 lines
3.4 KiB
C
/*
|
|
* Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
|
|
* Licensed under the GPL
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <unistd.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
#include <termios.h>
|
|
#include "chan_user.h"
|
|
#include "user.h"
|
|
#include "user_util.h"
|
|
#include "kern_util.h"
|
|
#include "os.h"
|
|
|
|
struct pty_chan {
|
|
void (*announce)(char *dev_name, int dev);
|
|
int dev;
|
|
int raw;
|
|
struct termios tt;
|
|
char dev_name[sizeof("/dev/pts/0123456\0")];
|
|
};
|
|
|
|
static void *pty_chan_init(char *str, int device, struct chan_opts *opts)
|
|
{
|
|
struct pty_chan *data;
|
|
|
|
data = um_kmalloc(sizeof(*data));
|
|
if(data == NULL) return(NULL);
|
|
*data = ((struct pty_chan) { .announce = opts->announce,
|
|
.dev = device,
|
|
.raw = opts->raw });
|
|
return(data);
|
|
}
|
|
|
|
static int pts_open(int input, int output, int primary, void *d,
|
|
char **dev_out)
|
|
{
|
|
struct pty_chan *data = d;
|
|
char *dev;
|
|
int fd, err;
|
|
|
|
fd = get_pty();
|
|
if(fd < 0){
|
|
err = -errno;
|
|
printk("open_pts : Failed to open pts\n");
|
|
return err;
|
|
}
|
|
if(data->raw){
|
|
CATCH_EINTR(err = tcgetattr(fd, &data->tt));
|
|
if(err)
|
|
return(err);
|
|
|
|
err = raw(fd);
|
|
if(err)
|
|
return(err);
|
|
}
|
|
|
|
dev = ptsname(fd);
|
|
sprintf(data->dev_name, "%s", dev);
|
|
*dev_out = data->dev_name;
|
|
if (data->announce)
|
|
(*data->announce)(dev, data->dev);
|
|
return(fd);
|
|
}
|
|
|
|
static int getmaster(char *line)
|
|
{
|
|
char *pty, *bank, *cp;
|
|
int master, err;
|
|
|
|
pty = &line[strlen("/dev/ptyp")];
|
|
for (bank = "pqrs"; *bank; bank++) {
|
|
line[strlen("/dev/pty")] = *bank;
|
|
*pty = '0';
|
|
if (os_stat_file(line, NULL) < 0)
|
|
break;
|
|
for (cp = "0123456789abcdef"; *cp; cp++) {
|
|
*pty = *cp;
|
|
master = os_open_file(line, of_rdwr(OPENFLAGS()), 0);
|
|
if (master >= 0) {
|
|
char *tp = &line[strlen("/dev/")];
|
|
|
|
/* verify slave side is usable */
|
|
*tp = 't';
|
|
err = os_access(line, OS_ACC_RW_OK);
|
|
*tp = 'p';
|
|
if(err == 0) return(master);
|
|
(void) os_close_file(master);
|
|
}
|
|
}
|
|
}
|
|
return(-1);
|
|
}
|
|
|
|
static int pty_open(int input, int output, int primary, void *d,
|
|
char **dev_out)
|
|
{
|
|
struct pty_chan *data = d;
|
|
int fd, err;
|
|
char dev[sizeof("/dev/ptyxx\0")] = "/dev/ptyxx";
|
|
|
|
fd = getmaster(dev);
|
|
if(fd < 0)
|
|
return(-errno);
|
|
|
|
if(data->raw){
|
|
err = raw(fd);
|
|
if(err)
|
|
return(err);
|
|
}
|
|
|
|
if(data->announce) (*data->announce)(dev, data->dev);
|
|
|
|
sprintf(data->dev_name, "%s", dev);
|
|
*dev_out = data->dev_name;
|
|
return(fd);
|
|
}
|
|
|
|
static int pty_console_write(int fd, const char *buf, int n, void *d)
|
|
{
|
|
struct pty_chan *data = d;
|
|
|
|
return(generic_console_write(fd, buf, n, &data->tt));
|
|
}
|
|
|
|
struct chan_ops pty_ops = {
|
|
.type = "pty",
|
|
.init = pty_chan_init,
|
|
.open = pty_open,
|
|
.close = generic_close,
|
|
.read = generic_read,
|
|
.write = generic_write,
|
|
.console_write = pty_console_write,
|
|
.window_size = generic_window_size,
|
|
.free = generic_free,
|
|
.winch = 0,
|
|
};
|
|
|
|
struct chan_ops pts_ops = {
|
|
.type = "pts",
|
|
.init = pty_chan_init,
|
|
.open = pts_open,
|
|
.close = generic_close,
|
|
.read = generic_read,
|
|
.write = generic_write,
|
|
.console_write = pty_console_write,
|
|
.window_size = generic_window_size,
|
|
.free = generic_free,
|
|
.winch = 0,
|
|
};
|
|
|
|
/*
|
|
* Overrides for Emacs so that we follow Linus's tabbing style.
|
|
* Emacs will notice this stuff at the end of the file and automatically
|
|
* adjust the settings for this buffer only. This must remain at the end
|
|
* of the file.
|
|
* ---------------------------------------------------------------------------
|
|
* Local variables:
|
|
* c-file-style: "linux"
|
|
* End:
|
|
*/
|