Skip to content
Snippets Groups Projects
Commit 8ca842c4 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

uml: remove os_* usage from userspace files 


This patch fixes some userspace files which were calling libc through the os_*
wrappers.

It turns out that there was only one user of os_new_tty_pgrp, so it can be
deleted.

There are also some style and whitespace fixes in here.

Signed-off-by: default avatarJeff Dike <jdike@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 28078e8f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
arch/um/drivers/chan_user.c
+ 21
− 16
View file @ 8ca842c4
...@@ -134,12 +134,12 @@ static int winch_thread(void *arg) ...@@ -134,12 +134,12 @@ static int winch_thread(void *arg)
struct winch_data *data = arg; struct winch_data *data = arg;
sigset_t sigs; sigset_t sigs;
int pty_fd, pipe_fd; int pty_fd, pipe_fd;
int count, err; int count;
char c = 1; char c = 1;
pty_fd = data->pty_fd; pty_fd = data->pty_fd;
pipe_fd = data->pipe_fd; pipe_fd = data->pipe_fd;
count = os_write_file(pipe_fd, &c, sizeof(c)); count = write(pipe_fd, &c, sizeof(c));
if (count != sizeof(c)) if (count != sizeof(c))
printk(UM_KERN_ERR "winch_thread : failed to write " printk(UM_KERN_ERR "winch_thread : failed to write "
"synchronization byte, err = %d\n", -count); "synchronization byte, err = %d\n", -count);
...@@ -167,10 +167,15 @@ static int winch_thread(void *arg) ...@@ -167,10 +167,15 @@ static int winch_thread(void *arg)
exit(1); exit(1);
} }
err = os_new_tty_pgrp(pty_fd, os_getpid()); if(ioctl(pty_fd, TIOCSCTTY, 0) < 0){
if (err < 0) { printk(UM_KERN_ERR "winch_thread : TIOCSCTTY failed on "
printk(UM_KERN_ERR "winch_thread : new_tty_pgrp failed on " "fd %d err = %d\n", pty_fd, errno);
"fd %d err = %d\n", pty_fd, -err); exit(1);
}
if(tcsetpgrp(pty_fd, os_getpid()) < 0){
printk(UM_KERN_ERR "winch_thread : tcsetpgrp failed on "
"fd %d err = %d\n", pty_fd, errno);
exit(1); exit(1);
} }
...@@ -180,10 +185,10 @@ static int winch_thread(void *arg) ...@@ -180,10 +185,10 @@ static int winch_thread(void *arg)
* kernel semaphores. We don't use SysV semaphores because they are * kernel semaphores. We don't use SysV semaphores because they are
* persistent. * persistent.
*/ */
count = os_read_file(pipe_fd, &c, sizeof(c)); count = read(pipe_fd, &c, sizeof(c));
if (count != sizeof(c)) if (count != sizeof(c))
printk(UM_KERN_ERR "winch_thread : failed to read " printk(UM_KERN_ERR "winch_thread : failed to read "
"synchronization byte, err = %d\n", -count); "synchronization byte, err = %d\n", errno);
while(1) { while(1) {
/* /*
...@@ -192,10 +197,10 @@ static int winch_thread(void *arg) ...@@ -192,10 +197,10 @@ static int winch_thread(void *arg)
*/ */
sigsuspend(&sigs); sigsuspend(&sigs);
count = os_write_file(pipe_fd, &c, sizeof(c)); count = write(pipe_fd, &c, sizeof(c));
if (count != sizeof(c)) if (count != sizeof(c))
printk(UM_KERN_ERR "winch_thread : write failed, " printk(UM_KERN_ERR "winch_thread : write failed, "
"err = %d\n", -count); "err = %d\n", errno);
} }
} }
...@@ -229,11 +234,11 @@ static int winch_tramp(int fd, struct tty_struct *tty, int *fd_out, ...@@ -229,11 +234,11 @@ static int winch_tramp(int fd, struct tty_struct *tty, int *fd_out,
} }
*fd_out = fds[0]; *fd_out = fds[0];
n = os_read_file(fds[0], &c, sizeof(c)); n = read(fds[0], &c, sizeof(c));
if (n != sizeof(c)) { if (n != sizeof(c)) {
printk(UM_KERN_ERR "winch_tramp : failed to read " printk(UM_KERN_ERR "winch_tramp : failed to read "
"synchronization byte\n"); "synchronization byte\n");
printk(UM_KERN_ERR "read failed, err = %d\n", -n); printk(UM_KERN_ERR "read failed, err = %d\n", errno);
printk(UM_KERN_ERR "fd %d will not support SIGWINCH\n", fd); printk(UM_KERN_ERR "fd %d will not support SIGWINCH\n", fd);
err = -EINVAL; err = -EINVAL;
goto out_close; goto out_close;
...@@ -248,8 +253,8 @@ static int winch_tramp(int fd, struct tty_struct *tty, int *fd_out, ...@@ -248,8 +253,8 @@ static int winch_tramp(int fd, struct tty_struct *tty, int *fd_out,
return err; return err;
out_close: out_close:
os_close_file(fds[1]); close(fds[1]);
os_close_file(fds[0]); close(fds[0]);
out: out:
return err; return err;
} }
...@@ -271,9 +276,9 @@ void register_winch(int fd, struct tty_struct *tty) ...@@ -271,9 +276,9 @@ void register_winch(int fd, struct tty_struct *tty)
register_winch_irq(thread_fd, fd, thread, tty, stack); register_winch_irq(thread_fd, fd, thread, tty, stack);
count = os_write_file(thread_fd, &c, sizeof(c)); count = write(thread_fd, &c, sizeof(c));
if (count != sizeof(c)) if (count != sizeof(c))
printk(UM_KERN_ERR "register_winch : failed to write " printk(UM_KERN_ERR "register_winch : failed to write "
"synchronization byte, err = %d\n", -count); "synchronization byte, err = %d\n", errno);
} }
} }
arch/um/drivers/harddog_user.c
+ 27
− 27
View file @ 8ca842c4
/* /*
* Copyright (C) 2002 Jeff Dike (jdike@karaya.com) * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
* Licensed under the GPL * Licensed under the GPL
*/ */
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include "user.h"
#include "mconsole.h"
#include "os.h" #include "os.h"
#include "user.h"
struct dog_data { struct dog_data {
int stdin; int stdin;
...@@ -23,10 +22,10 @@ static void pre_exec(void *d) ...@@ -23,10 +22,10 @@ static void pre_exec(void *d)
dup2(data->stdin, 0); dup2(data->stdin, 0);
dup2(data->stdout, 1); dup2(data->stdout, 1);
dup2(data->stdout, 2); dup2(data->stdout, 2);
os_close_file(data->stdin); close(data->stdin);
os_close_file(data->stdout); close(data->stdout);
os_close_file(data->close_me[0]); close(data->close_me[0]);
os_close_file(data->close_me[1]); close(data->close_me[1]);
} }
int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock) int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock)
...@@ -40,13 +39,13 @@ int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock) ...@@ -40,13 +39,13 @@ int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock)
char **args = NULL; char **args = NULL;
err = os_pipe(in_fds, 1, 0); err = os_pipe(in_fds, 1, 0);
if(err < 0){ if (err < 0) {
printk("harddog_open - os_pipe failed, err = %d\n", -err); printk("harddog_open - os_pipe failed, err = %d\n", -err);
goto out; goto out;
} }
err = os_pipe(out_fds, 1, 0); err = os_pipe(out_fds, 1, 0);
if(err < 0){ if (err < 0) {
printk("harddog_open - os_pipe failed, err = %d\n", -err); printk("harddog_open - os_pipe failed, err = %d\n", -err);
goto out_close_in; goto out_close_in;
} }
...@@ -56,7 +55,7 @@ int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock) ...@@ -56,7 +55,7 @@ int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock)
data.close_me[0] = out_fds[1]; data.close_me[0] = out_fds[1];
data.close_me[1] = in_fds[0]; data.close_me[1] = in_fds[0];
if(sock != NULL){ if (sock != NULL) {
mconsole_args[2] = sock; mconsole_args[2] = sock;
args = mconsole_args; args = mconsole_args;
} }
...@@ -68,25 +67,25 @@ int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock) ...@@ -68,25 +67,25 @@ int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock)
pid = run_helper(pre_exec, &data, args); pid = run_helper(pre_exec, &data, args);
os_close_file(out_fds[0]); close(out_fds[0]);
os_close_file(in_fds[1]); close(in_fds[1]);
if(pid < 0){ if (pid < 0) {
err = -pid; err = -pid;
printk("harddog_open - run_helper failed, errno = %d\n", -err); printk("harddog_open - run_helper failed, errno = %d\n", -err);
goto out_close_out; goto out_close_out;
} }
n = os_read_file(in_fds[0], &c, sizeof(c)); n = read(in_fds[0], &c, sizeof(c));
if(n == 0){ if (n == 0) {
printk("harddog_open - EOF on watchdog pipe\n"); printk("harddog_open - EOF on watchdog pipe\n");
helper_wait(pid); helper_wait(pid);
err = -EIO; err = -EIO;
goto out_close_out; goto out_close_out;
} }
else if(n < 0){ else if (n < 0) {
printk("harddog_open - read of watchdog pipe failed, " printk("harddog_open - read of watchdog pipe failed, "
"err = %d\n", -n); "err = %d\n", errno);
helper_wait(pid); helper_wait(pid);
err = n; err = n;
goto out_close_out; goto out_close_out;
...@@ -96,19 +95,19 @@ int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock) ...@@ -96,19 +95,19 @@ int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock)
return 0; return 0;
out_close_in: out_close_in:
os_close_file(in_fds[0]); close(in_fds[0]);
os_close_file(in_fds[1]); close(in_fds[1]);
out_close_out: out_close_out:
os_close_file(out_fds[0]); close(out_fds[0]);
os_close_file(out_fds[1]); close(out_fds[1]);
out: out:
return err; return err;
} }
void stop_watchdog(int in_fd, int out_fd) void stop_watchdog(int in_fd, int out_fd)
{ {
os_close_file(in_fd); close(in_fd);
os_close_file(out_fd); close(out_fd);
} }
int ping_watchdog(int fd) int ping_watchdog(int fd)
...@@ -116,10 +115,11 @@ int ping_watchdog(int fd) ...@@ -116,10 +115,11 @@ int ping_watchdog(int fd)
int n; int n;
char c = '\n'; char c = '\n';
n = os_write_file(fd, &c, sizeof(c)); n = write(fd, &c, sizeof(c));
if(n != sizeof(c)){ if (n != sizeof(c)) {
printk("ping_watchdog - write failed, err = %d\n", -n); printk("ping_watchdog - write failed, ret = %d, err = %d\n",
if(n < 0) n, errno);
if (n < 0)
return n; return n;
return -EIO; return -EIO;
} }
......
arch/um/include/mconsole.h
+ 1
− 12
View file @ 8ca842c4
/* /*
* Copyright (C) 2001 Lennert Buytenhek (buytenh@gnu.org) * Copyright (C) 2001 Lennert Buytenhek (buytenh@gnu.org)
* Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com) * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
* Licensed under the GPL * Licensed under the GPL
*/ */
...@@ -96,14 +96,3 @@ extern void lock_notify(void); ...@@ -96,14 +96,3 @@ extern void lock_notify(void);
extern void unlock_notify(void); extern void unlock_notify(void);
#endif #endif
/*
* 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:
*/
arch/um/include/os.h
+ 0
− 1
View file @ 8ca842c4
...@@ -132,7 +132,6 @@ extern void os_print_error(int error, const char* str); ...@@ -132,7 +132,6 @@ extern void os_print_error(int error, const char* str);
extern int os_get_exec_close(int fd, int *close_on_exec); extern int os_get_exec_close(int fd, int *close_on_exec);
extern int os_set_exec_close(int fd, int close_on_exec); extern int os_set_exec_close(int fd, int close_on_exec);
extern int os_ioctl_generic(int fd, unsigned int cmd, unsigned long arg); extern int os_ioctl_generic(int fd, unsigned int cmd, unsigned long arg);
extern int os_new_tty_pgrp(int fd, int pid);
extern int os_get_ifname(int fd, char *namebuf); extern int os_get_ifname(int fd, char *namebuf);
extern int os_set_slip(int fd); extern int os_set_slip(int fd);
extern int os_set_owner(int fd, int pid); extern int os_set_owner(int fd, int pid);
......
arch/um/include/sysdep-i386/ptrace.h
+ 1
− 2
View file @ 8ca842c4
/* /*
* Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
* Licensed under the GPL * Licensed under the GPL
*/ */
...@@ -130,7 +130,6 @@ struct syscall_args { ...@@ -130,7 +130,6 @@ struct syscall_args {
} \ } \
val; \ val; \
}) })
#define UPT_SET(regs, reg, val) \ #define UPT_SET(regs, reg, val) \
do { \ do { \
......
arch/um/include/sysdep-x86_64/ptrace.h
+ 76
− 76
View file @ 8ca842c4
...@@ -143,87 +143,87 @@ struct syscall_args { ...@@ -143,87 +143,87 @@ struct syscall_args {
}; };
#define SYSCALL_ARGS(r) ((struct syscall_args) \ #define SYSCALL_ARGS(r) ((struct syscall_args) \
{ .args = { UPT_SYSCALL_ARG1(r), \ { .args = { UPT_SYSCALL_ARG1(r), \
UPT_SYSCALL_ARG2(r), \ UPT_SYSCALL_ARG2(r), \
UPT_SYSCALL_ARG3(r), \ UPT_SYSCALL_ARG3(r), \
UPT_SYSCALL_ARG4(r), \ UPT_SYSCALL_ARG4(r), \
UPT_SYSCALL_ARG5(r), \ UPT_SYSCALL_ARG5(r), \
UPT_SYSCALL_ARG6(r) } } ) UPT_SYSCALL_ARG6(r) } } )
#define UPT_REG(regs, reg) \ #define UPT_REG(regs, reg) \
({ unsigned long val; \ ({ unsigned long val; \
switch(reg){ \ switch(reg){ \
case R8: val = UPT_R8(regs); break; \ case R8: val = UPT_R8(regs); break; \
case R9: val = UPT_R9(regs); break; \ case R9: val = UPT_R9(regs); break; \
case R10: val = UPT_R10(regs); break; \ case R10: val = UPT_R10(regs); break; \
case R11: val = UPT_R11(regs); break; \ case R11: val = UPT_R11(regs); break; \
case R12: val = UPT_R12(regs); break; \ case R12: val = UPT_R12(regs); break; \
case R13: val = UPT_R13(regs); break; \ case R13: val = UPT_R13(regs); break; \
case R14: val = UPT_R14(regs); break; \ case R14: val = UPT_R14(regs); break; \
case R15: val = UPT_R15(regs); break; \ case R15: val = UPT_R15(regs); break; \
case RIP: val = UPT_IP(regs); break; \ case RIP: val = UPT_IP(regs); break; \
case RSP: val = UPT_SP(regs); break; \ case RSP: val = UPT_SP(regs); break; \
case RAX: val = UPT_RAX(regs); break; \ case RAX: val = UPT_RAX(regs); break; \
case RBX: val = UPT_RBX(regs); break; \ case RBX: val = UPT_RBX(regs); break; \
case RCX: val = UPT_RCX(regs); break; \ case RCX: val = UPT_RCX(regs); break; \
case RDX: val = UPT_RDX(regs); break; \ case RDX: val = UPT_RDX(regs); break; \
case RSI: val = UPT_RSI(regs); break; \ case RSI: val = UPT_RSI(regs); break; \
case RDI: val = UPT_RDI(regs); break; \ case RDI: val = UPT_RDI(regs); break; \
case RBP: val = UPT_RBP(regs); break; \ case RBP: val = UPT_RBP(regs); break; \
case ORIG_RAX: val = UPT_ORIG_RAX(regs); break; \ case ORIG_RAX: val = UPT_ORIG_RAX(regs); break; \
case CS: val = UPT_CS(regs); break; \ case CS: val = UPT_CS(regs); break; \
case SS: val = UPT_SS(regs); break; \ case SS: val = UPT_SS(regs); break; \
case FS_BASE: val = UPT_FS_BASE(regs); break; \ case FS_BASE: val = UPT_FS_BASE(regs); break; \
case GS_BASE: val = UPT_GS_BASE(regs); break; \ case GS_BASE: val = UPT_GS_BASE(regs); break; \
case DS: val = UPT_DS(regs); break; \ case DS: val = UPT_DS(regs); break; \
case ES: val = UPT_ES(regs); break; \ case ES: val = UPT_ES(regs); break; \
case FS : val = UPT_FS (regs); break; \ case FS : val = UPT_FS (regs); break; \
case GS: val = UPT_GS(regs); break; \ case GS: val = UPT_GS(regs); break; \
case EFLAGS: val = UPT_EFLAGS(regs); break; \ case EFLAGS: val = UPT_EFLAGS(regs); break; \
default : \ default : \
panic("Bad register in UPT_REG : %d\n", reg); \ panic("Bad register in UPT_REG : %d\n", reg); \
val = -1; \ val = -1; \
} \ } \
val; \ val; \
}) })
#define UPT_SET(regs, reg, val) \ #define UPT_SET(regs, reg, val) \
({ unsigned long __upt_val = val; \ ({ unsigned long __upt_val = val; \
switch(reg){ \ switch(reg){ \
case R8: UPT_R8(regs) = __upt_val; break; \ case R8: UPT_R8(regs) = __upt_val; break; \
case R9: UPT_R9(regs) = __upt_val; break; \ case R9: UPT_R9(regs) = __upt_val; break; \
case R10: UPT_R10(regs) = __upt_val; break; \ case R10: UPT_R10(regs) = __upt_val; break; \
case R11: UPT_R11(regs) = __upt_val; break; \ case R11: UPT_R11(regs) = __upt_val; break; \
case R12: UPT_R12(regs) = __upt_val; break; \ case R12: UPT_R12(regs) = __upt_val; break; \
case R13: UPT_R13(regs) = __upt_val; break; \ case R13: UPT_R13(regs) = __upt_val; break; \
case R14: UPT_R14(regs) = __upt_val; break; \ case R14: UPT_R14(regs) = __upt_val; break; \
case R15: UPT_R15(regs) = __upt_val; break; \ case R15: UPT_R15(regs) = __upt_val; break; \
case RIP: UPT_IP(regs) = __upt_val; break; \ case RIP: UPT_IP(regs) = __upt_val; break; \
case RSP: UPT_SP(regs) = __upt_val; break; \ case RSP: UPT_SP(regs) = __upt_val; break; \
case RAX: UPT_RAX(regs) = __upt_val; break; \ case RAX: UPT_RAX(regs) = __upt_val; break; \
case RBX: UPT_RBX(regs) = __upt_val; break; \ case RBX: UPT_RBX(regs) = __upt_val; break; \
case RCX: UPT_RCX(regs) = __upt_val; break; \ case RCX: UPT_RCX(regs) = __upt_val; break; \
case RDX: UPT_RDX(regs) = __upt_val; break; \ case RDX: UPT_RDX(regs) = __upt_val; break; \
case RSI: UPT_RSI(regs) = __upt_val; break; \ case RSI: UPT_RSI(regs) = __upt_val; break; \
case RDI: UPT_RDI(regs) = __upt_val; break; \ case RDI: UPT_RDI(regs) = __upt_val; break; \
case RBP: UPT_RBP(regs) = __upt_val; break; \ case RBP: UPT_RBP(regs) = __upt_val; break; \
case ORIG_RAX: UPT_ORIG_RAX(regs) = __upt_val; break; \ case ORIG_RAX: UPT_ORIG_RAX(regs) = __upt_val; break; \
case CS: UPT_CS(regs) = __upt_val; break; \ case CS: UPT_CS(regs) = __upt_val; break; \
case SS: UPT_SS(regs) = __upt_val; break; \ case SS: UPT_SS(regs) = __upt_val; break; \
case FS_BASE: UPT_FS_BASE(regs) = __upt_val; break; \ case FS_BASE: UPT_FS_BASE(regs) = __upt_val; break; \
case GS_BASE: UPT_GS_BASE(regs) = __upt_val; break; \ case GS_BASE: UPT_GS_BASE(regs) = __upt_val; break; \
case DS: UPT_DS(regs) = __upt_val; break; \ case DS: UPT_DS(regs) = __upt_val; break; \
case ES: UPT_ES(regs) = __upt_val; break; \ case ES: UPT_ES(regs) = __upt_val; break; \
case FS: UPT_FS(regs) = __upt_val; break; \ case FS: UPT_FS(regs) = __upt_val; break; \
case GS: UPT_GS(regs) = __upt_val; break; \ case GS: UPT_GS(regs) = __upt_val; break; \
case EFLAGS: UPT_EFLAGS(regs) = __upt_val; break; \ case EFLAGS: UPT_EFLAGS(regs) = __upt_val; break; \
default : \ default : \
panic("Bad register in UPT_SET : %d\n", reg); \ panic("Bad register in UPT_SET : %d\n", reg); \
break; \ break; \
} \ } \
__upt_val; \ __upt_val; \
}) })
#define UPT_SET_SYSCALL_RETURN(r, res) \ #define UPT_SET_SYSCALL_RETURN(r, res) \
REGS_SET_SYSCALL_RETURN((r)->regs, (res)) REGS_SET_SYSCALL_RETURN((r)->regs, (res))
......
arch/um/kernel/skas/uaccess.c
+ 60
− 74
View file @ 8ca842c4
/* /*
* Copyright (C) 2002 - 2003 Jeff Dike (jdike@addtoit.com) * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
* Licensed under the GPL * Licensed under the GPL
*/ */
#include "linux/compiler.h" #include "linux/err.h"
#include "linux/stddef.h"
#include "linux/kernel.h"
#include "linux/string.h"
#include "linux/fs.h"
#include "linux/hardirq.h"
#include "linux/highmem.h" #include "linux/highmem.h"
#include "linux/mm.h"
#include "asm/current.h"
#include "asm/page.h" #include "asm/page.h"
#include "asm/pgtable.h" #include "asm/pgtable.h"
#include "asm/uaccess.h"
#include "kern_util.h" #include "kern_util.h"
#include "os.h" #include "os.h"
...@@ -27,16 +23,16 @@ static unsigned long maybe_map(unsigned long virt, int is_write) ...@@ -27,16 +23,16 @@ static unsigned long maybe_map(unsigned long virt, int is_write)
void *phys = um_virt_to_phys(current, virt, &pte); void *phys = um_virt_to_phys(current, virt, &pte);
int dummy_code; int dummy_code;
if(IS_ERR(phys) || (is_write && !pte_write(pte))){ if (IS_ERR(phys) || (is_write && !pte_write(pte))) {
err = handle_page_fault(virt, 0, is_write, 1, &dummy_code); err = handle_page_fault(virt, 0, is_write, 1, &dummy_code);
if(err) if (err)
return(-1UL); return -1UL;
phys = um_virt_to_phys(current, virt, NULL); phys = um_virt_to_phys(current, virt, NULL);
} }
if(IS_ERR(phys)) if (IS_ERR(phys))
phys = (void *) -1; phys = (void *) -1;
return((unsigned long) phys); return (unsigned long) phys;
} }
static int do_op_one_page(unsigned long addr, int len, int is_write, static int do_op_one_page(unsigned long addr, int len, int is_write,
...@@ -46,17 +42,18 @@ static int do_op_one_page(unsigned long addr, int len, int is_write, ...@@ -46,17 +42,18 @@ static int do_op_one_page(unsigned long addr, int len, int is_write,
int n; int n;
addr = maybe_map(addr, is_write); addr = maybe_map(addr, is_write);
if(addr == -1UL) if (addr == -1UL)
return(-1); return -1;
page = phys_to_page(addr); page = phys_to_page(addr);
addr = (unsigned long) kmap_atomic(page, KM_UML_USERCOPY) + (addr & ~PAGE_MASK); addr = (unsigned long) kmap_atomic(page, KM_UML_USERCOPY) +
(addr & ~PAGE_MASK);
n = (*op)(addr, len, arg); n = (*op)(addr, len, arg);
kunmap_atomic(page, KM_UML_USERCOPY); kunmap_atomic(page, KM_UML_USERCOPY);
return(n); return n;
} }
static void do_buffer_op(void *jmpbuf, void *arg_ptr) static void do_buffer_op(void *jmpbuf, void *arg_ptr)
...@@ -81,21 +78,21 @@ static void do_buffer_op(void *jmpbuf, void *arg_ptr) ...@@ -81,21 +78,21 @@ static void do_buffer_op(void *jmpbuf, void *arg_ptr)
current->thread.fault_catcher = jmpbuf; current->thread.fault_catcher = jmpbuf;
n = do_op_one_page(addr, size, is_write, op, arg); n = do_op_one_page(addr, size, is_write, op, arg);
if(n != 0){ if (n != 0) {
*res = (n < 0 ? remain : 0); *res = (n < 0 ? remain : 0);
goto out; goto out;
} }
addr += size; addr += size;
remain -= size; remain -= size;
if(remain == 0){ if (remain == 0) {
*res = 0; *res = 0;
goto out; goto out;
} }
while(addr < ((addr + remain) & PAGE_MASK)){ while(addr < ((addr + remain) & PAGE_MASK)) {
n = do_op_one_page(addr, PAGE_SIZE, is_write, op, arg); n = do_op_one_page(addr, PAGE_SIZE, is_write, op, arg);
if(n != 0){ if (n != 0) {
*res = (n < 0 ? remain : 0); *res = (n < 0 ? remain : 0);
goto out; goto out;
} }
...@@ -103,13 +100,13 @@ static void do_buffer_op(void *jmpbuf, void *arg_ptr) ...@@ -103,13 +100,13 @@ static void do_buffer_op(void *jmpbuf, void *arg_ptr)
addr += PAGE_SIZE; addr += PAGE_SIZE;
remain -= PAGE_SIZE; remain -= PAGE_SIZE;
} }
if(remain == 0){ if (remain == 0) {
*res = 0; *res = 0;
goto out; goto out;
} }
n = do_op_one_page(addr, remain, is_write, op, arg); n = do_op_one_page(addr, remain, is_write, op, arg);
if(n != 0) if (n != 0)
*res = (n < 0 ? remain : 0); *res = (n < 0 ? remain : 0);
else *res = 0; else *res = 0;
out: out:
...@@ -124,10 +121,10 @@ static int buffer_op(unsigned long addr, int len, int is_write, ...@@ -124,10 +121,10 @@ static int buffer_op(unsigned long addr, int len, int is_write,
faulted = setjmp_wrapper(do_buffer_op, addr, len, is_write, op, arg, faulted = setjmp_wrapper(do_buffer_op, addr, len, is_write, op, arg,
&res); &res);
if(!faulted) if (!faulted)
return(res); return res;
return(addr + len - (unsigned long) current->thread.fault_addr); return addr + len - (unsigned long) current->thread.fault_addr;
} }
static int copy_chunk_from_user(unsigned long from, int len, void *arg) static int copy_chunk_from_user(unsigned long from, int len, void *arg)
...@@ -136,19 +133,19 @@ static int copy_chunk_from_user(unsigned long from, int len, void *arg) ...@@ -136,19 +133,19 @@ static int copy_chunk_from_user(unsigned long from, int len, void *arg)
memcpy((void *) to, (void *) from, len); memcpy((void *) to, (void *) from, len);
*to_ptr += len; *to_ptr += len;
return(0); return 0;
} }
int copy_from_user(void *to, const void __user *from, int n) int copy_from_user(void *to, const void __user *from, int n)
{ {
if(segment_eq(get_fs(), KERNEL_DS)){ if (segment_eq(get_fs(), KERNEL_DS)) {
memcpy(to, (__force void*)from, n); memcpy(to, (__force void*)from, n);
return(0); return 0;
} }
return(access_ok(VERIFY_READ, from, n) ? return access_ok(VERIFY_READ, from, n) ?
buffer_op((unsigned long) from, n, 0, copy_chunk_from_user, &to): buffer_op((unsigned long) from, n, 0, copy_chunk_from_user, &to):
n); n;
} }
static int copy_chunk_to_user(unsigned long to, int len, void *arg) static int copy_chunk_to_user(unsigned long to, int len, void *arg)
...@@ -157,19 +154,19 @@ static int copy_chunk_to_user(unsigned long to, int len, void *arg) ...@@ -157,19 +154,19 @@ static int copy_chunk_to_user(unsigned long to, int len, void *arg)
memcpy((void *) to, (void *) from, len); memcpy((void *) to, (void *) from, len);
*from_ptr += len; *from_ptr += len;
return(0); return 0;
} }
int copy_to_user(void __user *to, const void *from, int n) int copy_to_user(void __user *to, const void *from, int n)
{ {
if(segment_eq(get_fs(), KERNEL_DS)){ if (segment_eq(get_fs(), KERNEL_DS)) {
memcpy((__force void*)to, from, n); memcpy((__force void *) to, from, n);
return(0); return 0;
} }
return(access_ok(VERIFY_WRITE, to, n) ? return access_ok(VERIFY_WRITE, to, n) ?
buffer_op((unsigned long) to, n, 1, copy_chunk_to_user, &from) : buffer_op((unsigned long) to, n, 1, copy_chunk_to_user, &from) :
n); n;
} }
static int strncpy_chunk_from_user(unsigned long from, int len, void *arg) static int strncpy_chunk_from_user(unsigned long from, int len, void *arg)
...@@ -181,9 +178,9 @@ static int strncpy_chunk_from_user(unsigned long from, int len, void *arg) ...@@ -181,9 +178,9 @@ static int strncpy_chunk_from_user(unsigned long from, int len, void *arg)
n = strnlen(to, len); n = strnlen(to, len);
*to_ptr += n; *to_ptr += n;
if(n < len) if (n < len)
return(1); return 1;
return(0); return 0;
} }
int strncpy_from_user(char *dst, const char __user *src, int count) int strncpy_from_user(char *dst, const char __user *src, int count)
...@@ -191,41 +188,41 @@ int strncpy_from_user(char *dst, const char __user *src, int count) ...@@ -191,41 +188,41 @@ int strncpy_from_user(char *dst, const char __user *src, int count)
int n; int n;
char *ptr = dst; char *ptr = dst;
if(segment_eq(get_fs(), KERNEL_DS)){ if (segment_eq(get_fs(), KERNEL_DS)) {
strncpy(dst, (__force void*)src, count); strncpy(dst, (__force void *) src, count);
return(strnlen(dst, count)); return strnlen(dst, count);
} }
if(!access_ok(VERIFY_READ, src, 1)) if (!access_ok(VERIFY_READ, src, 1))
return(-EFAULT); return -EFAULT;
n = buffer_op((unsigned long) src, count, 0, strncpy_chunk_from_user, n = buffer_op((unsigned long) src, count, 0, strncpy_chunk_from_user,
&ptr); &ptr);
if(n != 0) if (n != 0)
return(-EFAULT); return -EFAULT;
return(strnlen(dst, count)); return strnlen(dst, count);
} }
static int clear_chunk(unsigned long addr, int len, void *unused) static int clear_chunk(unsigned long addr, int len, void *unused)
{ {
memset((void *) addr, 0, len); memset((void *) addr, 0, len);
return(0); return 0;
} }
int __clear_user(void __user *mem, int len) int __clear_user(void __user *mem, int len)
{ {
return(buffer_op((unsigned long) mem, len, 1, clear_chunk, NULL)); return buffer_op((unsigned long) mem, len, 1, clear_chunk, NULL);
} }
int clear_user(void __user *mem, int len) int clear_user(void __user *mem, int len)
{ {
if(segment_eq(get_fs(), KERNEL_DS)){ if (segment_eq(get_fs(), KERNEL_DS)) {
memset((__force void*)mem, 0, len); memset((__force void*)mem, 0, len);
return(0); return 0;
} }
return(access_ok(VERIFY_WRITE, mem, len) ? return access_ok(VERIFY_WRITE, mem, len) ?
buffer_op((unsigned long) mem, len, 1, clear_chunk, NULL) : len); buffer_op((unsigned long) mem, len, 1, clear_chunk, NULL) : len;
} }
static int strnlen_chunk(unsigned long str, int len, void *arg) static int strnlen_chunk(unsigned long str, int len, void *arg)
...@@ -235,31 +232,20 @@ static int strnlen_chunk(unsigned long str, int len, void *arg) ...@@ -235,31 +232,20 @@ static int strnlen_chunk(unsigned long str, int len, void *arg)
n = strnlen((void *) str, len); n = strnlen((void *) str, len);
*len_ptr += n; *len_ptr += n;
if(n < len) if (n < len)
return(1); return 1;
return(0); return 0;
} }
int strnlen_user(const void __user *str, int len) int strnlen_user(const void __user *str, int len)
{ {
int count = 0, n; int count = 0, n;
if(segment_eq(get_fs(), KERNEL_DS)) if (segment_eq(get_fs(), KERNEL_DS))
return(strnlen((__force char*)str, len) + 1); return strnlen((__force char*)str, len) + 1;
n = buffer_op((unsigned long) str, len, 0, strnlen_chunk, &count); n = buffer_op((unsigned long) str, len, 0, strnlen_chunk, &count);
if(n == 0) if (n == 0)
return(count + 1); return count + 1;
return(-EFAULT); return -EFAULT;
} }
/*
* 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:
*/
arch/um/os-Linux/file.c
+ 0
− 11
View file @ 8ca842c4
...@@ -101,17 +101,6 @@ int os_ioctl_generic(int fd, unsigned int cmd, unsigned long arg) ...@@ -101,17 +101,6 @@ int os_ioctl_generic(int fd, unsigned int cmd, unsigned long arg)
return err; return err;
} }
int os_new_tty_pgrp(int fd, int pid)
{
if(ioctl(fd, TIOCSCTTY, 0) < 0)
return -errno;
if(tcsetpgrp(fd, pid) < 0)
return -errno;
return 0;
}
/* FIXME: ensure namebuf in os_get_if_name is big enough */ /* FIXME: ensure namebuf in os_get_if_name is big enough */
int os_get_ifname(int fd, char* namebuf) int os_get_ifname(int fd, char* namebuf)
{ {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment