diff options
Diffstat (limited to 'arch/mips/kernel/linux32.c')
| -rw-r--r-- | arch/mips/kernel/linux32.c | 74 |
1 files changed, 12 insertions, 62 deletions
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c index 3f40c37a9ee6..a7d2bb3cf835 100644 --- a/arch/mips/kernel/linux32.c +++ b/arch/mips/kernel/linux32.c | |||
| @@ -356,73 +356,13 @@ asmlinkage int sys32_llseek(unsigned int fd, unsigned int offset_high, | |||
| 356 | asmlinkage ssize_t sys32_pread(unsigned int fd, char __user * buf, | 356 | asmlinkage ssize_t sys32_pread(unsigned int fd, char __user * buf, |
| 357 | size_t count, u32 unused, u64 a4, u64 a5) | 357 | size_t count, u32 unused, u64 a4, u64 a5) |
| 358 | { | 358 | { |
| 359 | ssize_t ret; | 359 | return sys_pread64(fd, buf, count, merge_64(a4, a5)); |
| 360 | struct file * file; | ||
| 361 | ssize_t (*read)(struct file *, char __user *, size_t, loff_t *); | ||
| 362 | loff_t pos; | ||
| 363 | |||
| 364 | ret = -EBADF; | ||
| 365 | file = fget(fd); | ||
| 366 | if (!file) | ||
| 367 | goto bad_file; | ||
| 368 | if (!(file->f_mode & FMODE_READ)) | ||
| 369 | goto out; | ||
| 370 | pos = merge_64(a4, a5); | ||
| 371 | ret = rw_verify_area(READ, file, &pos, count); | ||
| 372 | if (ret < 0) | ||
| 373 | goto out; | ||
| 374 | ret = -EINVAL; | ||
| 375 | if (!file->f_op || !(read = file->f_op->read)) | ||
| 376 | goto out; | ||
| 377 | if (pos < 0) | ||
| 378 | goto out; | ||
| 379 | ret = -ESPIPE; | ||
| 380 | if (!(file->f_mode & FMODE_PREAD)) | ||
| 381 | goto out; | ||
| 382 | ret = read(file, buf, count, &pos); | ||
| 383 | if (ret > 0) | ||
| 384 | dnotify_parent(file->f_dentry, DN_ACCESS); | ||
| 385 | out: | ||
| 386 | fput(file); | ||
| 387 | bad_file: | ||
| 388 | return ret; | ||
| 389 | } | 360 | } |
| 390 | 361 | ||
| 391 | asmlinkage ssize_t sys32_pwrite(unsigned int fd, const char __user * buf, | 362 | asmlinkage ssize_t sys32_pwrite(unsigned int fd, const char __user * buf, |
| 392 | size_t count, u32 unused, u64 a4, u64 a5) | 363 | size_t count, u32 unused, u64 a4, u64 a5) |
| 393 | { | 364 | { |
| 394 | ssize_t ret; | 365 | return sys_pwrite64(fd, buf, count, merge_64(a4, a5)); |
| 395 | struct file * file; | ||
| 396 | ssize_t (*write)(struct file *, const char __user *, size_t, loff_t *); | ||
| 397 | loff_t pos; | ||
| 398 | |||
| 399 | ret = -EBADF; | ||
| 400 | file = fget(fd); | ||
| 401 | if (!file) | ||
| 402 | goto bad_file; | ||
| 403 | if (!(file->f_mode & FMODE_WRITE)) | ||
| 404 | goto out; | ||
| 405 | pos = merge_64(a4, a5); | ||
| 406 | ret = rw_verify_area(WRITE, file, &pos, count); | ||
| 407 | if (ret < 0) | ||
| 408 | goto out; | ||
| 409 | ret = -EINVAL; | ||
| 410 | if (!file->f_op || !(write = file->f_op->write)) | ||
| 411 | goto out; | ||
| 412 | if (pos < 0) | ||
| 413 | goto out; | ||
| 414 | |||
| 415 | ret = -ESPIPE; | ||
| 416 | if (!(file->f_mode & FMODE_PWRITE)) | ||
| 417 | goto out; | ||
| 418 | |||
| 419 | ret = write(file, buf, count, &pos); | ||
| 420 | if (ret > 0) | ||
| 421 | dnotify_parent(file->f_dentry, DN_MODIFY); | ||
| 422 | out: | ||
| 423 | fput(file); | ||
| 424 | bad_file: | ||
| 425 | return ret; | ||
| 426 | } | 366 | } |
| 427 | 367 | ||
| 428 | asmlinkage int sys32_sched_rr_get_interval(compat_pid_t pid, | 368 | asmlinkage int sys32_sched_rr_get_interval(compat_pid_t pid, |
| @@ -1182,6 +1122,16 @@ asmlinkage ssize_t sys32_readahead(int fd, u32 pad0, u64 a2, u64 a3, | |||
| 1182 | return sys_readahead(fd, merge_64(a2, a3), count); | 1122 | return sys_readahead(fd, merge_64(a2, a3), count); |
| 1183 | } | 1123 | } |
| 1184 | 1124 | ||
| 1125 | asmlinkage long sys32_sync_file_range(int fd, int __pad, | ||
| 1126 | unsigned long a2, unsigned long a3, | ||
| 1127 | unsigned long a4, unsigned long a5, | ||
| 1128 | int flags) | ||
| 1129 | { | ||
| 1130 | return sys_sync_file_range(fd, | ||
| 1131 | merge_64(a2, a3), merge_64(a4, a5), | ||
| 1132 | flags); | ||
| 1133 | } | ||
| 1134 | |||
| 1185 | /* Argument list sizes for sys_socketcall */ | 1135 | /* Argument list sizes for sys_socketcall */ |
| 1186 | #define AL(x) ((x) * sizeof(unsigned int)) | 1136 | #define AL(x) ((x) * sizeof(unsigned int)) |
| 1187 | static unsigned char socketcall_nargs[18]={AL(0),AL(3),AL(3),AL(3),AL(2),AL(3), | 1137 | static unsigned char socketcall_nargs[18]={AL(0),AL(3),AL(3),AL(3),AL(2),AL(3), |
