diff --git a/[refs] b/[refs] index 756943af6a82..1e3bdc5ed94a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d55e2ca87321b65387d3c52dd38128b3fe6723b0 +refs/heads/master: 8317f14b60c02c69cf7f594e2aabc8a3fdc9618d diff --git a/trunk/fs/compat.c b/trunk/fs/compat.c index 7b21b0a82596..1de2331db844 100644 --- a/trunk/fs/compat.c +++ b/trunk/fs/compat.c @@ -2230,21 +2230,16 @@ asmlinkage long compat_sys_signalfd(int ufd, asmlinkage long compat_sys_timerfd(int ufd, int clockid, int flags, const struct compat_itimerspec __user *utmr) { - long res; struct itimerspec t; struct itimerspec __user *ut; - res = -EFAULT; if (get_compat_itimerspec(&t, utmr)) - goto err_exit; + return -EFAULT; ut = compat_alloc_user_space(sizeof(*ut)); - if (copy_to_user(ut, &t, sizeof(t)) ) - goto err_exit; + if (copy_to_user(ut, &t, sizeof(t))) + return -EFAULT; - res = sys_timerfd(ufd, clockid, flags, ut); -err_exit: - return res; + return sys_timerfd(ufd, clockid, flags, ut); } #endif /* CONFIG_TIMERFD */ -