diff options
Diffstat (limited to 'kernel/compat.c')
| -rw-r--r-- | kernel/compat.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/compat.c b/kernel/compat.c index d52e2ec1deb5..42d56544460f 100644 --- a/kernel/compat.c +++ b/kernel/compat.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/migrate.h> | 24 | #include <linux/migrate.h> |
| 25 | #include <linux/posix-timers.h> | 25 | #include <linux/posix-timers.h> |
| 26 | #include <linux/times.h> | 26 | #include <linux/times.h> |
| 27 | #include <linux/ptrace.h> | ||
| 27 | 28 | ||
| 28 | #include <asm/uaccess.h> | 29 | #include <asm/uaccess.h> |
| 29 | 30 | ||
| @@ -229,6 +230,7 @@ asmlinkage long compat_sys_times(struct compat_tms __user *tbuf) | |||
| 229 | if (copy_to_user(tbuf, &tmp, sizeof(tmp))) | 230 | if (copy_to_user(tbuf, &tmp, sizeof(tmp))) |
| 230 | return -EFAULT; | 231 | return -EFAULT; |
| 231 | } | 232 | } |
| 233 | force_successful_syscall_return(); | ||
| 232 | return compat_jiffies_to_clock_t(jiffies); | 234 | return compat_jiffies_to_clock_t(jiffies); |
| 233 | } | 235 | } |
| 234 | 236 | ||
| @@ -894,8 +896,9 @@ asmlinkage long compat_sys_time(compat_time_t __user * tloc) | |||
| 894 | 896 | ||
| 895 | if (tloc) { | 897 | if (tloc) { |
| 896 | if (put_user(i,tloc)) | 898 | if (put_user(i,tloc)) |
| 897 | i = -EFAULT; | 899 | return -EFAULT; |
| 898 | } | 900 | } |
| 901 | force_successful_syscall_return(); | ||
| 899 | return i; | 902 | return i; |
| 900 | } | 903 | } |
| 901 | 904 | ||
