luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] uml: error handling fixes

Browse Source 
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: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jeff Dike 2006-05-01 12:16:00 -07:00 committed by Linus Torvalds
parent 347b3dc2fa
commit 2ace87b950
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/um/os-Linux/file.c
View File

@ -171,7 +171,7 @@ int os_sigio_async(int master, int slave)
flags = fcntl(master, F_GETFL); flags = fcntl(master, F_GETFL);
if(flags < 0) if(flags < 0)
return errno; return -errno;
if((fcntl(master, F_SETFL, flags | O_NONBLOCK | O_ASYNC) < 0) || if((fcntl(master, F_SETFL, flags | O_NONBLOCK | O_ASYNC) < 0) ||
(fcntl(master, F_SETOWN, os_getpid()) < 0)) (fcntl(master, F_SETOWN, os_getpid()) < 0))

6
arch/um/os-Linux/skas/process.c
View File

@ -344,12 +344,12 @@ int copy_context_skas0(unsigned long new_stack, int pid)
err = ptrace_setregs(pid, regs); err = ptrace_setregs(pid, regs);
if(err < 0) if(err < 0)
panic("copy_context_skas0 : PTRACE_SETREGS failed, " 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); err = ptrace_setfpregs(pid, fp_regs);
if(err < 0) if(err < 0)
panic("copy_context_skas0 : PTRACE_SETFPREGS failed, " 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 */ /* set a well known return code for detection of child write failure */
child_data->err = 12345678; child_data->err = 12345678;
@ -362,7 +362,7 @@ int copy_context_skas0(unsigned long new_stack, int pid)
pid = data->err; pid = data->err;
if(pid < 0) if(pid < 0)
panic("copy_context_skas0 - stub-parent reports error %d\n", panic("copy_context_skas0 - stub-parent reports error %d\n",
pid); -pid);
/* Wait, until child has finished too: read child's result from /* Wait, until child has finished too: read child's result from
* child's stack and check it. * child's stack and check it.

4
arch/um/os-Linux/sys-i386/registers.c
View File

@ -104,7 +104,7 @@ void init_registers(int pid)
err = ptrace(PTRACE_GETREGS, pid, 0, exec_regs); err = ptrace(PTRACE_GETREGS, pid, 0, exec_regs);
if(err) if(err)
panic("check_ptrace : PTRACE_GETREGS failed, errno = %d", panic("check_ptrace : PTRACE_GETREGS failed, errno = %d",
err); errno);
errno = 0; errno = 0;
err = ptrace(PTRACE_GETFPXREGS, pid, 0, exec_fpx_regs); 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); err = ptrace(PTRACE_GETFPREGS, pid, 0, exec_fp_regs);
if(err) if(err)
panic("check_ptrace : PTRACE_GETFPREGS failed, errno = %d", panic("check_ptrace : PTRACE_GETFPREGS failed, errno = %d",
err); errno);
} }
void get_safe_registers(unsigned long *regs, unsigned long *fp_regs) void get_safe_registers(unsigned long *regs, unsigned long *fp_regs)

4
arch/um/os-Linux/sys-x86_64/registers.c
View File

@ -62,12 +62,12 @@ void init_registers(int pid)
err = ptrace(PTRACE_GETREGS, pid, 0, exec_regs); err = ptrace(PTRACE_GETREGS, pid, 0, exec_regs);
if(err) if(err)
panic("check_ptrace : PTRACE_GETREGS failed, errno = %d", panic("check_ptrace : PTRACE_GETREGS failed, errno = %d",
err); errno);
err = ptrace(PTRACE_GETFPREGS, pid, 0, exec_fp_regs); err = ptrace(PTRACE_GETFPREGS, pid, 0, exec_fp_regs);
if(err) if(err)
panic("check_ptrace : PTRACE_GETFPREGS failed, errno = %d", panic("check_ptrace : PTRACE_GETFPREGS failed, errno = %d",
err); errno);
} }
void get_safe_registers(unsigned long *regs, unsigned long *fp_regs) void get_safe_registers(unsigned long *regs, unsigned long *fp_regs)

4
arch/um/os-Linux/umid.c
View File

@ -178,14 +178,14 @@ static void __init create_pid_file(void)
fd = open(file, O_RDWR | O_CREAT | O_EXCL, 0644); fd = open(file, O_RDWR | O_CREAT | O_EXCL, 0644);
if(fd < 0){ if(fd < 0){
printk("Open of machine pid file \"%s\" failed: %s\n", printk("Open of machine pid file \"%s\" failed: %s\n",
file, strerror(-fd)); file, strerror(errno));
return; return;
} }
snprintf(pid, sizeof(pid), "%d\n", getpid()); snprintf(pid, sizeof(pid), "%d\n", getpid());
n = write(fd, pid, strlen(pid)); n = write(fd, pid, strlen(pid));
if(n != 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); close(fd);
} }