From: Al Viro <viro@ZenIV.linux.org.uk>
To: linux-kernel@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>
Subject: [PATCH 07/16] {clock_,}nanosleep(2): merge timespec copyout logics into a new helper
Date: Wed, 7 Jun 2017 09:42:32 +0100 [thread overview]
Message-ID: <20170607084241.28657-7-viro@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20170607084241.28657-1-viro@ZenIV.linux.org.uk>
From: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
include/linux/hrtimer.h | 2 ++
kernel/time/alarmtimer.c | 10 +---------
kernel/time/hrtimer.c | 24 +++++++++++++++---------
kernel/time/posix-cpu-timers.c | 13 ++-----------
4 files changed, 20 insertions(+), 29 deletions(-)
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index b80c34f6fd4b..38b968f3df4e 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -452,6 +452,8 @@ static inline u64 hrtimer_forward_now(struct hrtimer *timer,
}
/* Precise sleep: */
+
+extern int nanosleep_copyout(struct restart_block *, struct timespec *);
extern long hrtimer_nanosleep(struct timespec64 *rqtp,
const enum hrtimer_mode mode,
const clockid_t clockid);
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index 868083ae7434..80154e795535 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -721,15 +721,7 @@ static int alarmtimer_do_nsleep(struct alarm *alarm, ktime_t absexp,
return 0;
rmt = ktime_to_timespec(rem);
-#ifdef CONFIG_COMPAT
- if (restart->nanosleep.kind == 2) {
- if (compat_put_timespec(&rmt,
- restart->nanosleep.compat_rmtp))
- return -EFAULT;
- } else
-#endif
- if (copy_to_user(restart->nanosleep.rmtp, &rmt, sizeof(rmt)))
- return -EFAULT;
+ return nanosleep_copyout(restart, &rmt);
}
return -ERESTART_RESTARTBLOCK;
}
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index 5534606e3985..6c19995e977e 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -1440,6 +1440,20 @@ void hrtimer_init_sleeper(struct hrtimer_sleeper *sl, struct task_struct *task)
}
EXPORT_SYMBOL_GPL(hrtimer_init_sleeper);
+int nanosleep_copyout(struct restart_block *restart, struct timespec *ts)
+{
+ BUG_ON(!restart->nanosleep.kind);
+#ifdef CONFIG_COMPAT
+ if (restart->nanosleep.kind == 2) {
+ if (compat_put_timespec(ts, restart->nanosleep.compat_rmtp))
+ return -EFAULT;
+ } else
+#endif
+ if (copy_to_user(restart->nanosleep.rmtp, ts, sizeof(struct timespec)))
+ return -EFAULT;
+ return -ERESTART_RESTARTBLOCK;
+}
+
static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mode)
{
struct restart_block *restart;
@@ -1470,15 +1484,7 @@ static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mod
return 0;
rmt = ktime_to_timespec(rem);
-#ifdef CONFIG_COMPAT
- if (restart->nanosleep.kind == 2) {
- if (compat_put_timespec(&rmt,
- restart->nanosleep.compat_rmtp))
- return -EFAULT;
- } else
-#endif
- if (copy_to_user(restart->nanosleep.rmtp, &rmt, sizeof(rmt)))
- return -EFAULT;
+ return nanosleep_copyout(restart, &rmt);
}
return -ERESTART_RESTARTBLOCK;
}
diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index b88bc3fc56c5..ba0d7e34616b 100644
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -1312,21 +1312,12 @@ static int do_cpu_nanosleep(const clockid_t which_clock, int flags,
* Report back to the user the time still remaining.
*/
restart = ¤t->restart_block;
+ restart->nanosleep.expires = timespec64_to_ns(rqtp);
if (restart->nanosleep.kind) {
struct timespec ts;
ts = timespec64_to_timespec(it.it_value);
-#ifdef CONFIG_COMPAT
- if (restart->nanosleep.kind == 2) {
- if (compat_put_timespec(&ts,
- restart->nanosleep.compat_rmtp))
- return -EFAULT;
- } else
-#endif
- if (copy_to_user(restart->nanosleep.rmtp, &ts,
- sizeof(ts)))
- return -EFAULT;
+ error = nanosleep_copyout(restart, &ts);
}
- restart->nanosleep.expires = timespec64_to_ns(rqtp);
}
return error;
--
2.11.0
next prev parent reply other threads:[~2017-06-07 8:47 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-07 8:41 [PATCHSET] sanitizing compat nanosleep and other timer-related syscalls Al Viro
2017-06-07 8:42 ` [PATCH 01/16] move copyout of timespec into do_cpu_nanosleep() Al Viro
2017-06-07 8:42 ` [PATCH 02/16] move copyout and freeze handling into alarmtimer_do_nsleep() Al Viro
2017-06-13 22:04 ` [tip:timers/core] alarmtimer: Move " tip-bot for Al Viro
2017-06-07 8:42 ` [PATCH 03/16] hrtimer_nanosleep(): pass rmtp in restart_block Al Viro
2017-06-13 22:05 ` [tip:timers/core] hrtimer_nanosleep(): Pass " tip-bot for Al Viro
2017-06-07 8:42 ` [PATCH 04/16] move copyout to do_nanosleel() Al Viro
2017-06-13 22:05 ` [tip:timers/core] hrtimer: Move copyout of remaining time to do_nanosleep() tip-bot for Al Viro
2017-06-07 8:42 ` [PATCH 05/16] clock_nanosleep(): stash rmtp into restart_block Al Viro
2017-06-13 22:06 ` [tip:timers/core] posix-timers: Store rmtp into restart_block in sys_clock_nanosleep() tip-bot for Al Viro
2017-06-07 8:42 ` [PATCH 06/16] nanosleep/clock_nanosleep: teach to do compat copyouts Al Viro
2017-06-07 10:07 ` Peter Zijlstra
2017-06-13 22:06 ` [tip:timers/core] time/posix-timers: Move the compat copyouts to the nanosleep implementations tip-bot for Al Viro
2017-06-07 8:42 ` Al Viro [this message]
2017-06-13 22:07 ` [tip:timers/core] hrtimers/posix-timers: Merge nanosleep timespec copyout logics into a new helper tip-bot for Al Viro
2017-06-07 8:42 ` [PATCH 08/16] kill ->nsleep_restart() Al Viro
2017-06-13 22:08 ` [tip:timers/core] posix-timers: Kill ->nsleep_restart() tip-bot for Al Viro
2017-06-07 8:42 ` [PATCH 09/16] move adjtimex-related compat syscalls to native counterparts Al Viro
2017-06-13 22:08 ` [tip:timers/core] ntp: Move adjtimex related " tip-bot for Al Viro
2017-06-07 8:42 ` [PATCH 10/16] take compat timer_settime(2) to native one Al Viro
2017-06-13 22:09 ` [tip:timers/core] posix-timers: Take " tip-bot for Al Viro
2017-06-07 8:42 ` [PATCH 11/16] take compat timer_gettime(2) " Al Viro
2017-06-13 22:09 ` [tip:timers/core] posix-timers: Take " tip-bot for Al Viro
2017-06-07 8:42 ` [PATCH 12/16] move compat itimer syscalls to native ones Al Viro
2017-06-13 22:10 ` [tip:timers/core] itimers: Move " tip-bot for Al Viro
2017-06-07 8:42 ` [PATCH 13/16] clock_gettime/clock_settime/clock_getres: move to native syscalls Al Viro
2017-06-13 22:10 ` [tip:timers/core] posix-timers: Move compat versions of clock_gettime/settime/getres tip-bot for Al Viro
2017-06-07 8:42 ` [PATCH 14/16] timer_create(): move compat to native, get rid of set_fs() Al Viro
2017-06-13 22:11 ` [tip:timers/core] posix-timers: Move compat_timer_create() " tip-bot for Al Viro
2017-06-07 8:42 ` [PATCH 15/16] time()/stime(): move compat to native Al Viro
2017-06-13 22:11 ` [tip:timers/core] time: Move compat_time()/stime() " tip-bot for Al Viro
2017-06-07 8:42 ` [PATCH 16/16] gettimeofday()/settimeofday(): move compat " Al Viro
2017-06-13 22:12 ` [tip:timers/core] time: Move compat_gettimeofday()/settimeofday() " tip-bot for Al Viro
2017-06-12 23:08 ` [PATCH 01/16] move copyout of timespec into do_cpu_nanosleep() Thomas Gleixner
2017-06-13 7:46 ` Thomas Gleixner
2017-06-13 22:04 ` [tip:timers/core] posix-cpu-timers: Move " tip-bot for Al Viro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170607084241.28657-7-viro@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).