posix_cpu_timers: fix timer never expires when executes clock_nanosleep
PATCH 1/1 posix_cpu_timers: fix timer never expires when executes clock_nanosleep
Quoted 1 line
From
c7439b90b0794c016b29356f0e232f7413ef7b60Mon Sep 17 00:00:00 2001
From: Dong Zhu <[email protected]>
Date: Thu, 1 Aug 2013 11:39:04 +0800
When use the current process pid as the clockid, then executes clock_nanosleep syscall the timer will never expire. Kernel should prevent user doing like this and this patch is supposed to fix it.I wrote a simple case to test it:
#include <time.h>
#include <errno.h>
#include <unistd.h>
#include <sys/types.h>
#define CPU_CLOCK_PROF 0
#define CPU_CLOCK_VIRT 1
#define CPU_CLOCK_SCHED 2
#define CPU_CLOCK_THREAD 4
#define PID_TO_CLOCKID(pid, clock) ((~(clockid_t) (pid) << 3) | (clockid_t) (clock))
int main(void)
{
int ret;
pid_t pid;
clockid_t clk;
struct timespec ts;
ts.tv_sec = 1;
ts.tv_nsec = 0;
pid = getpid();
clk = PID_TO_CLOCKID(pid, CPU_CLOCK_PROF);
if ((ret = clock_nanosleep(clk, 0, &ts, NULL)) != 0) {
perror("clock_nanosleep");
return ret;
}
return 0;
}--- kernel/posix-cpu-timers.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/posix-cpu-timers.c +3 -3
@@ -1413,9 +1413,9 @@ static int posix_cpu_nsleep(const clockid_t which_clock, int flags,/* * Diagnose required errors first. */ -if (CPUCLOCK_PERTHREAD (which_clock) && - (CPUCLOCK_PID (which_clock) ==0 || -CPUCLOCK_PID (which_clock) == current->pid)) +if (CPUCLOCK_PID (which_clock) == current->pid || + (CPUCLOCK_PERTHREAD (which_clock) && +CPUCLOCK_PID (which_clock) ==0 ))return -EINVAL ; error =do_cpu_nanosleep (which_clock, flags, rqtp, &it);
Signature · 6 lines
1.7.11.7 -- Best Regards, Dong Zhu
Hi Dong Zhu
Quoted 5 lines · Dong Zhu
kernel/posix-cpu-timers.c +0
-0
kernel/posix-cpu-timers.c static int posix_cpu_nsleep(const clockid_t which_clock, int flags, · line 1419
Quoted 10 lines
kernel/posix-cpu-timers.c +3
-3@@ -1413,9 +1413,9 @@ static int posix_cpu_nsleep(const clockid_t which_clock, int flags,/* * Diagnose required errors first. */ -if (CPUCLOCK_PERTHREAD (which_clock) && - (CPUCLOCK_PID (which_clock) ==0 || -CPUCLOCK_PID (which_clock) == current->pid)) +if (CPUCLOCK_PID (which_clock) == current->pid || + (CPUCLOCK_PERTHREAD (which_clock) && +CPUCLOCK_PID (which_clock) ==0 ))return -EINVAL ;
Nope, this is wrong. We have to allow own pid process clock, because it can be used correctly on multi-threaded processes. Own tid thread clock has no sense and we correctly return -EINVAL in such case.
We could possibly add check for own pid together with check if process consist of one thread, but that is too complicated IMHO especially taking into account that threads on the process can be destroyed and created dynamically.
Stanislaw
Hi Stanislaw,
Thansk for your info.
Quoted 13 lines · Stanislaw Gruszka
Hi Dong Zhu
Quoted 10 lines · Dong Zhu
kernel/posix-cpu-timers.c +0
-2@@ -1413,9 +1413,9 @@ static int posix_cpu_nsleep(const clockid_t which_clock, int flags,/* * Diagnose required errors first. */ - if (CPUCLOCK_PERTHREAD(which_clock) && - (CPUCLOCK_PID(which_clock) == 0 ||
Quoted 8 lines
kernel/posix-cpu-timers.c static int posix_cpu_nsleep(const clockid_t which_clock, int flags, · line 1419
Quoted 5 lines
kernel/posix-cpu-timers.c +3
-1- CPUCLOCK_PID(which_clock) == current->pid)) +if (CPUCLOCK_PID (which_clock) == current->pid || + (CPUCLOCK_PERTHREAD (which_clock) && +CPUCLOCK_PID (which_clock) ==0 ))return -EINVAL ;Nope, this is wrong. We have to allow own pid process clock, because it can be used correctly on multi-threaded processes. Own tid thread clock
Yes, you are right, I really neglected this point.
Quoted 8 lines
has no sense and we correctly return
-EINVALin such case.We could possibly add check for own pid together with check if process consist of one thread, but that is too complicated IMHO especially taking into account that threads on the process can be destroyed and created dynamically.
Agree, really so complicated.
Signature · 2 lines
Best Regards, Dong Zhu