Commit dc1561ac authored Feb 24, 2006 by Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds Feb 24, 2006

[PATCH] uml: os_connect_socket error path fixup



Fix an fd leak and a return of -1 instead of -errno in the error path - this
showed up in intensive testing of HPPFS, the os_connect_socket user.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 635dd50b

arch/um/os-Linux/file.c

+14 −5

Original line number	Diff line number	Diff line
		@@ -272,14 +272,23 @@ int os_connect_socket(char *name)
		snprintf(sock.sun_path, sizeof(sock.sun_path), "%s", name);

		fd = socket(AF_UNIX, SOCK_STREAM, 0);
		if(fd < 0)
		return(fd);
		if(fd < 0) {
		err = -errno;
		goto out;
		}

		err = connect(fd, (struct sockaddr *) &sock, sizeof(sock));
		if(err)
		return(-errno);
		if(err) {
		err = -errno;
		goto out_close;
		}

		return(fd);
		return fd;

		out_close:
		close(fd);
		out:
		return err;
		}

		void os_close_file(int fd)