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

[PATCH] uml: error handling fixes 



Blairsorblade noticed some confusion between our use of a system
call's return value and errno.  This patch fixes a number of related
bugs -
	using errno instead of a return value
	using a return value instead of errno
	forgetting to negate a error return to get a positive error code

Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 347b3dc2

arch/um/os-Linux/file.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ int os_sigio_async(int master, int slave) 


	flags = fcntl(master, F_GETFL);

	if(flags < 0)

		return errno;

		return -errno;



	if((fcntl(master, F_SETFL, flags | O_NONBLOCK | O_ASYNC) < 0) ||

	   (fcntl(master, F_SETOWN, os_getpid()) < 0))

arch/um/os-Linux/skas/process.c

+3 −3
Original line number Diff line number Diff line
@@ -344,12 +344,12 @@ int copy_context_skas0(unsigned long new_stack, int pid) 
	err = ptrace_setregs(pid, regs);

	if(err < 0)

		panic("copy_context_skas0 : PTRACE_SETREGS failed, "

		      "pid = %d, errno = %d\n", pid, errno);

		      "pid = %d, errno = %d\n", pid, -err);



	err = ptrace_setfpregs(pid, fp_regs);

	if(err < 0)

		panic("copy_context_skas0 : PTRACE_SETFPREGS failed, "

		      "pid = %d, errno = %d\n", pid, errno);

		      "pid = %d, errno = %d\n", pid, -err);



	/* set a well known return code for detection of child write failure */

	child_data->err = 12345678;
@@ -362,7 +362,7 @@ int copy_context_skas0(unsigned long new_stack, int pid) 
	pid = data->err;

	if(pid < 0)

		panic("copy_context_skas0 - stub-parent reports error %d\n",

		      pid);

		      -pid);



	/* Wait, until child has finished too: read child's result from

	 * child's stack and check it.

arch/um/os-Linux/sys-i386/registers.c

+2 −2
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ void init_registers(int pid) 
	err = ptrace(PTRACE_GETREGS, pid, 0, exec_regs);

	if(err)

		panic("check_ptrace : PTRACE_GETREGS failed, errno = %d",

		      err);

		      errno);



	errno = 0;

	err = ptrace(PTRACE_GETFPXREGS, pid, 0, exec_fpx_regs);
@@ -119,7 +119,7 @@ void init_registers(int pid) 
	err = ptrace(PTRACE_GETFPREGS, pid, 0, exec_fp_regs);

	if(err)

		panic("check_ptrace : PTRACE_GETFPREGS failed, errno = %d",

		      err);

		      errno);

}



void get_safe_registers(unsigned long *regs, unsigned long *fp_regs)

arch/um/os-Linux/sys-x86_64/registers.c

+2 −2
Original line number Diff line number Diff line
@@ -62,12 +62,12 @@ void init_registers(int pid) 
	err = ptrace(PTRACE_GETREGS, pid, 0, exec_regs);

	if(err)

		panic("check_ptrace : PTRACE_GETREGS failed, errno = %d",

		      err);

		      errno);



	err = ptrace(PTRACE_GETFPREGS, pid, 0, exec_fp_regs);

	if(err)

		panic("check_ptrace : PTRACE_GETFPREGS failed, errno = %d",

		      err);

		      errno);

}



void get_safe_registers(unsigned long *regs, unsigned long *fp_regs)

arch/um/os-Linux/umid.c

+2 −2
Original line number Diff line number Diff line
@@ -178,14 +178,14 @@ static void __init create_pid_file(void) 
	fd = open(file, O_RDWR | O_CREAT | O_EXCL, 0644);

	if(fd < 0){

		printk("Open of machine pid file \"%s\" failed: %s\n",

		       file, strerror(-fd));

		       file, strerror(errno));

		return;

	}



	snprintf(pid, sizeof(pid), "%d\n", getpid());

	n = write(fd, pid, strlen(pid));

	if(n != strlen(pid))

		printk("Write of pid file failed - err = %d\n", -n);

		printk("Write of pid file failed - err = %d\n", errno);



	close(fd);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE