Commit b4fd310e authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[PATCH] uml: preserve errno in error paths 



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: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 64b7673f

arch/um/drivers/mcast_user.c

+8 −3
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static int mcast_open(void *data) 
	struct mcast_data *pri = data;

	struct sockaddr_in *sin = pri->mcast_addr;

	struct ip_mreq mreq;

	int fd = -EINVAL, yes = 1, err = -EINVAL;;

	int fd, yes = 1, err = 0;





	if ((sin->sin_addr.s_addr == 0) || (sin->sin_port == 0))
@@ -65,13 +65,14 @@ static int mcast_open(void *data) 
	if (fd < 0){

		printk("mcast_open : data socket failed, errno = %d\n", 

		       errno);

		fd = -errno;

		err = -errno;

		goto out;

	}



	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0) {

		printk("mcast_open: SO_REUSEADDR failed, errno = %d\n",

			errno);

		err = -errno;

		goto out_close;

	}
@@ -80,6 +81,7 @@ static int mcast_open(void *data) 
		       sizeof(pri->ttl)) < 0) {

		printk("mcast_open: IP_MULTICAST_TTL failed, error = %d\n",

			errno);

		err = -errno;

		goto out_close;

	}
@@ -87,12 +89,14 @@ static int mcast_open(void *data) 
	if (setsockopt(fd, SOL_IP, IP_MULTICAST_LOOP, &yes, sizeof(yes)) < 0) {

		printk("mcast_open: IP_MULTICAST_LOOP failed, error = %d\n",

			errno);

		err = -errno;

		goto out_close;

	}



	/* bind socket to mcast address */

	if (bind(fd, (struct sockaddr *) sin, sizeof(*sin)) < 0) {

		printk("mcast_open : data bind failed, errno = %d\n", errno);

		err = -errno;

		goto out_close;

	}
@@ -107,14 +111,15 @@ static int mcast_open(void *data) 
		       "interface on the host.\n");

		printk("eth0 should be configured in order to use the "

		       "multicast transport.\n");

		err = -errno;

                goto out_close;

	}



 out:

	return fd;



 out_close:

        os_close_file(fd);

 out:

        return err;

}

arch/um/drivers/mconsole_user.c

+3 −3
Original line number Diff line number Diff line
@@ -173,9 +173,9 @@ int mconsole_notify(char *sock_name, int type, const void *data, int len) 
	if(notify_sock < 0){

		notify_sock = socket(PF_UNIX, SOCK_DGRAM, 0);

		if(notify_sock < 0){

			printk("mconsole_notify - socket failed, errno = %d\n",

			       errno);

			err = -errno;

			printk("mconsole_notify - socket failed, errno = %d\n",

			       err);

		}

	}

	unlock_notify();
@@ -198,8 +198,8 @@ int mconsole_notify(char *sock_name, int type, const void *data, int len) 
	n = sendto(notify_sock, &packet, len, 0, (struct sockaddr *) &target, 

		   sizeof(target));

	if(n < 0){

		printk("mconsole_notify - sendto failed, errno = %d\n", errno);

		err = -errno;

		printk("mconsole_notify - sendto failed, errno = %d\n", errno);

	}

	return(err);

}

arch/um/drivers/pty.c

+2 −1
Original line number Diff line number Diff line
@@ -43,8 +43,9 @@ static int pts_open(int input, int output, int primary, void *d, 


	fd = get_pty();

	if(fd < 0){

		err = -errno;

		printk("open_pts : Failed to open pts\n");

		return(-errno);

		return err;

	}

	if(data->raw){

		CATCH_EINTR(err = tcgetattr(fd, &data->tt));

arch/um/drivers/xterm.c

+4 −2
Original line number Diff line number Diff line
@@ -110,13 +110,15 @@ int xterm_open(int input, int output, int primary, void *d, 


	fd = mkstemp(file);

	if(fd < 0){

		err = -errno;

		printk("xterm_open : mkstemp failed, errno = %d\n", errno);

		return(-errno);

		return err;

	}



	if(unlink(file)){

		err = -errno;

		printk("xterm_open : unlink failed, errno = %d\n", errno);

		return(-errno);

		return err;

	}

	os_close_file(fd);

arch/um/kernel/helper.c

+7 −5
Original line number Diff line number Diff line
@@ -85,8 +85,8 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv, 
	data.fd = fds[1];

	pid = clone(helper_child, (void *) sp, CLONE_VM | SIGCHLD, &data);

	if(pid < 0){

		printk("run_helper : clone failed, errno = %d\n", errno);

		ret = -errno;

		printk("run_helper : clone failed, errno = %d\n", errno);

		goto out_close;

	}
@@ -122,7 +122,7 @@ int run_helper_thread(int (*proc)(void *), void *arg, unsigned int flags, 
		      unsigned long *stack_out, int stack_order)

{

	unsigned long stack, sp;

	int pid, status;

	int pid, status, err;



	stack = alloc_stack(stack_order, um_in_interrupt());

	if(stack == 0) return(-ENOMEM);
@@ -130,16 +130,18 @@ int run_helper_thread(int (*proc)(void *), void *arg, unsigned int flags, 
	sp = stack + (page_size() << stack_order) - sizeof(void *);

	pid = clone(proc, (void *) sp, flags | SIGCHLD, arg);

	if(pid < 0){

		err = -errno;

		printk("run_helper_thread : clone failed, errno = %d\n", 

		       errno);

		return(-errno);

		return err;

	}

	if(stack_out == NULL){

		CATCH_EINTR(pid = waitpid(pid, &status, 0));

		if(pid < 0){

			err = -errno;

			printk("run_helper_thread - wait failed, errno = %d\n",

			       errno);

			pid = -errno;

			pid = err;

		}

		if(!WIFEXITED(status) || (WEXITSTATUS(status) != 0))

			printk("run_helper_thread - thread returned status "
@@ -156,8 +158,8 @@ int helper_wait(int pid) 


	CATCH_EINTR(ret = waitpid(pid, NULL, WNOHANG));

	if(ret < 0){

		ret = -errno;

		printk("helper_wait : waitpid failed, errno = %d\n", errno);

		return(-errno);

	}

	return(ret);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE