From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755189AbdKCUbi (ORCPT ); Fri, 3 Nov 2017 16:31:38 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:43668 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750772AbdKCUbh (ORCPT ); Fri, 3 Nov 2017 16:31:37 -0400 X-Google-Smtp-Source: ABhQp+QRqPI54rq6VloKrvB3vRlRa1F0ZJocX0kRjRyvF9q2Ued5q9HcqGAl1wHX+HVsDQp9SicUhA== From: Andrei Vagin To: Andrew Morton Cc: linux-kernel@vger.kernel.org, Andrei Vagin , Gargi Sharma , Oleg Nesterov Subject: [PATCH] pid: restore the old behaviour of the ns_last_pid sysctl Date: Fri, 3 Nov 2017 13:31:33 -0700 Message-Id: <20171103203133.19007-1-avagin@openvz.org> X-Mailer: git-send-email 2.13.6 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. fixes: ("pid: replace pid bitmap implementation with IDR API") Cc: Gargi Sharma Cc: Oleg Nesterov Signed-off-by: Andrei Vagin --- kernel/pid_namespace.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c index fea2c24fa460..504dadb1d920 100644 --- a/kernel/pid_namespace.c +++ b/kernel/pid_namespace.c @@ -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; -- 2.13.6