pid: restore the old behaviour of the ns_last_pid sysctl
PATCH 1/1 pid: restore the old behaviour of the ns_last_pid sysctl
CRIU uses ns_last_pid to fork a process with a specified pid. For example, if we need to create a process with the pid of 10000, we write 9999 into /proc/sys/kernel/ns_last_pid
$ echo 9999 > /proc/sys/kernel/ns_last_pid; sh -c 'echo $$' 10000
This behaviour has been broken and now if we write 9999 to ns_last_pid, a process will get the pid 9999. This patch restores the old behaviour.
--- kernel/pid_namespace.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
kernel/pid_namespace.c +13 -2
@@ -287,6 +287,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write, {struct pid_namespace *pid_ns =task_active_pid_ns (current);struct ctl_table tmp = *table; +int ret, next;if (write && !ns_capable (pid_ns->user_ns,CAP_SYS_ADMIN ))return -EPERM ;
@@ -297,8 +298,18 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,* it should synchronize its usage with external means. */ - tmp.data = &pid_ns->idr.idr_next; -return proc_dointvec_minmax (&tmp, write, buffer, lenp, ppos); + next =idr_get_cursor (&pid_ns->idr) -1 ; + + tmp.data = &next; + ret =proc_dointvec_minmax (&tmp, write, buffer, lenp, ppos); +if (ret <0 ) +return ret; + +if (!write) +return 0 ; + +idr_set_cursor (&pid_ns->idr, next +1 ); +return 0 ; }extern int pid_max;
Signature · 1 line
2.13.6
Quoted 9 lines · Andrei Vagin
kernel/pid_namespace.c +2
-2@@ -297,8 +298,18 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,* it should synchronize its usage with external means. */ - tmp.data = &pid_ns->idr.idr_next; -return proc_dointvec_minmax (&tmp, write, buffer, lenp, ppos); + next =idr_get_cursor (&pid_ns->idr) -1 ; +
kernel/pid_namespace.c static int pid_ns_ctl_handler(struct ctl_table *table, int write, · line 312
Quoted 10 lines
kernel/pid_namespace.c +10
-0+ tmp.data = &next; + ret =proc_dointvec_minmax (&tmp, write, buffer, lenp, ppos); +if (ret <0 ) +return ret; + +if (!write) +return 0 ; + +idr_set_cursor (&pid_ns->idr, next +1 ); +return 0 ;
Ah yes, we should also take "write" into account, I forgot it is readable. Can't resist, to me
err = proc_dointvec_minmax(...); if (!err && write) idr_set_cursor(...); return err;
looks a bit more readable, but this is matter of taste of course.
PATCH v2 1/1 pid: restore the old behaviour of the ns_last_pid sysctl
CRIU uses ns_last_pid to fork a process with a specified pid. For example, if we need to create a process with the pid of 10000, we write 9999 into /proc/sys/kernel/ns_last_pid
$ echo 9999 > /proc/sys/kernel/ns_last_pid; sh -c 'echo $$' 10000
This behaviour has been broken and now if we write 9999 to ns_last_pid, a process will get the pid 9999. This patch restores the old behaviour.
v2: make code a bit more readable // Oleg
--- kernel/pid_namespace.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
kernel/pid_namespace.c +9 -2
@@ -287,6 +287,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write, {struct pid_namespace *pid_ns =task_active_pid_ns (current);struct ctl_table tmp = *table; +int ret, next;if (write && !ns_capable (pid_ns->user_ns,CAP_SYS_ADMIN ))return -EPERM ;
@@ -297,8 +298,14 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,* it should synchronize its usage with external means. */ - tmp.data = &pid_ns->idr.idr_next; -return proc_dointvec_minmax (&tmp, write, buffer, lenp, ppos); + next =idr_get_cursor (&pid_ns->idr) -1 ; + + tmp.data = &next; + ret =proc_dointvec_minmax (&tmp, write, buffer, lenp, ppos); +if (!ret && write) +idr_set_cursor (&pid_ns->idr, next +1 ); + +return ret; }extern int pid_max;
Signature · 1 line
2.13.6