From patchwork Mon Jun 13 06:07:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Vagin X-Patchwork-Id: 12879041 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34820C433EF for ; Mon, 13 Jun 2022 06:07:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5E7C78D0156; Mon, 13 Jun 2022 02:07:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 570B98D0142; Mon, 13 Jun 2022 02:07:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3EA538D0156; Mon, 13 Jun 2022 02:07:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 2FD788D0142 for ; Mon, 13 Jun 2022 02:07:38 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 080C635200 for ; Mon, 13 Jun 2022 06:07:38 +0000 (UTC) X-FDA: 79572180996.05.FAD5E9F Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by imf07.hostedemail.com (Postfix) with ESMTP id A7A634006F for ; Mon, 13 Jun 2022 06:07:37 +0000 (UTC) Received: by mail-pg1-f169.google.com with SMTP id q140so4681795pgq.6 for ; Sun, 12 Jun 2022 23:07:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8rpGhRZe7OD9xjNF1m78RIAAcrJRhCm5pjhxYsieoHk=; b=qw13uZoq36bEli8mqrcMyU1ZDU0GLPkhc5EIb2TvM28HQOU6+Bp6//pg/xE2tf2Zmu C1ws5OPgHK2sMrWJuPCbrXbWfCzu+093uOcErbsEsJh5Hf1fPUiJ6O6eBFicsy/a0gZq BIN9IQXO73EoAsMeLhkWGivLl8jbP0BhRpvY0hneq8o6DtauPwc7S56XXZ8rao7JOx7E G4iPiLb1Jl5ZJeKVZlJsLDtl4KBHCH5elDbssGxKS0tLn6GwhBRxwSjlyBR1D6ksc6j9 A462hq6nvtEGRaas8A0ujrFFNUjRWqqv1YnTlBVqlaI0+nrj+d6VUDg2sOm8PeBViazt DtPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8rpGhRZe7OD9xjNF1m78RIAAcrJRhCm5pjhxYsieoHk=; b=HpLwBLQmC5OyaBdek9857snlCN8MRtOChKZ/ySOBHFIyb4G9lbrLWMn82tZeVSOfa/ s4VSMBveCQydiwYUb2TJA9amgI72YcNoqiFocJtMmgieQfRUo8MQj6k5TD8+r9zL5BnO HP3eY9AlUo9IItVjs1h+X9JAsgms951Fou+AlE8BxtrFDLkKNj8Kr25AtvEoUEjgt2gE hcGi19yIWz6u+11SDykbw/JNxCctykjjWWnAk//ZD6V1PAAHATHblSwDhY68uuOu55Un SgWpQRze9P0N9Z1VVuyRWs8vg0U073/ZuxaLAg2Y6Cut7klkB/GswGnwiPamQZ9dlDPK XVzQ== X-Gm-Message-State: AOAM532U8gj5tgiCtE6ZqLffim8LCkQpNZSaZTzinJ/t/S6jNsy/yzue w/hB2KyqZrpCnk+PCt0z25YaO/xj1Bo= X-Google-Smtp-Source: ABdhPJzURWDFcCmiEHOvEVLTggU4LjThqJO7Ns08nOOCFi+M9IUze1MifDyWiOid4te/GU4fksqIGw== X-Received: by 2002:a05:6a00:a16:b0:518:ffe0:7229 with SMTP id p22-20020a056a000a1600b00518ffe07229mr93599801pfh.49.1655100456409; Sun, 12 Jun 2022 23:07:36 -0700 (PDT) Received: from laptop.hsd1.wa.comcast.net ([2601:600:8500:5f14:d627:c51e:516e:a105]) by smtp.gmail.com with ESMTPSA id p5-20020a170903248500b0015e8d4eb1c8sm420157plw.18.2022.06.12.23.07.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jun 2022 23:07:35 -0700 (PDT) From: Andrei Vagin To: linux-kernel@vger.kernel.org, Dmitry Safonov <0x7f454c46@gmail.com>, Christian Brauner Cc: Florian Weimer , linux-mm@kvack.org, Eric Biederman , Kees Cook , Andrei Vagin Subject: [PATCH 2/2] testing/timens: add a test for vfork+exit Date: Sun, 12 Jun 2022 23:07:23 -0700 Message-Id: <20220613060723.197407-2-avagin@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220613060723.197407-1-avagin@gmail.com> References: <20220613060723.197407-1-avagin@gmail.com> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655100457; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=8rpGhRZe7OD9xjNF1m78RIAAcrJRhCm5pjhxYsieoHk=; b=XqXSGFuLS+cDGCnvq4IQ2/JDi1yY+yjxZs7mHmyqGq+RBJk52/YiI8jTrj2Xl4CSSopkGw BxffauPZ9yNOxKcPbkdYU1W8NE2TpsQeNPpU5vVNOYVXhiASCvE81cqTcFuXfMdw0EfYoy FGAZ7KbixDvDZIcdyPV5Hewxxq9OUYc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655100457; a=rsa-sha256; cv=none; b=n3cVVinhdLi6YeHdh64JhiYXqHhyi2EZdmiFrMsD+1ITLCyvXH9176aAVsGUwhbvqlhLo8 XNOwHdeNZfnCzZDFtMBRrxZDsOyjCDHr86TbcketGKGdb7k8pBZN7QN2lxuVSLlitom++V 2fHECO7FPqezeuByixEi6TpbJlAzWVc= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=qw13uZoq; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf07.hostedemail.com: domain of avagin@gmail.com designates 209.85.215.169 as permitted sender) smtp.mailfrom=avagin@gmail.com Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=qw13uZoq; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf07.hostedemail.com: domain of avagin@gmail.com designates 209.85.215.169 as permitted sender) smtp.mailfrom=avagin@gmail.com X-Rspamd-Server: rspam08 X-Rspam-User: X-Stat-Signature: ufbdryywnt8bsan7mbackx9zwe379iyq X-Rspamd-Queue-Id: A7A634006F X-HE-Tag: 1655100457-789647 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: * check that a child process is in parent's time namespace after vfork. * check that a child process is in the target namespace after exec. Output on success: $ ./vfork_exec 1..1 ok 1 exec Signed-off-by: Andrei Vagin --- tools/testing/selftests/timens/Makefile | 2 +- tools/testing/selftests/timens/vfork_exec.c | 90 +++++++++++++++++++++ 2 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/timens/vfork_exec.c diff --git a/tools/testing/selftests/timens/Makefile b/tools/testing/selftests/timens/Makefile index 3a5936cc10ab..f0d51d4d2c87 100644 --- a/tools/testing/selftests/timens/Makefile +++ b/tools/testing/selftests/timens/Makefile @@ -1,4 +1,4 @@ -TEST_GEN_PROGS := timens timerfd timer clock_nanosleep procfs exec futex +TEST_GEN_PROGS := timens timerfd timer clock_nanosleep procfs exec futex vfork_exec TEST_GEN_PROGS_EXTENDED := gettime_perf CFLAGS := -Wall -Werror -pthread diff --git a/tools/testing/selftests/timens/vfork_exec.c b/tools/testing/selftests/timens/vfork_exec.c new file mode 100644 index 000000000000..e6ccd900f30a --- /dev/null +++ b/tools/testing/selftests/timens/vfork_exec.c @@ -0,0 +1,90 @@ +// SPDX-License-Identifier: GPL-2.0 +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "log.h" +#include "timens.h" + +#define OFFSET (36000) + +int main(int argc, char *argv[]) +{ + struct timespec now, tst; + int status, i; + pid_t pid; + + if (argc > 1) { + if (sscanf(argv[1], "%ld", &now.tv_sec) != 1) + return pr_perror("sscanf"); + + for (i = 0; i < 2; i++) { + _gettime(CLOCK_MONOTONIC, &tst, i); + if (abs(tst.tv_sec - now.tv_sec) > 5) + return pr_fail("%ld %ld\n", now.tv_sec, tst.tv_sec); + } + return 0; + } + + nscheck(); + + ksft_set_plan(1); + + clock_gettime(CLOCK_MONOTONIC, &now); + + if (unshare_timens()) + return 1; + + if (_settime(CLOCK_MONOTONIC, OFFSET)) + return 1; + + for (i = 0; i < 2; i++) { + _gettime(CLOCK_MONOTONIC, &tst, i); + if (abs(tst.tv_sec - now.tv_sec) > 5) + return pr_fail("%ld %ld\n", + now.tv_sec, tst.tv_sec); + } + + pid = vfork(); + if (pid < 0) + return pr_perror("fork"); + + if (pid == 0) { + char now_str[64]; + char *cargv[] = {"exec", now_str, NULL}; + char *cenv[] = {NULL}; + + // Check that we are still in the source timens. + for (i = 0; i < 2; i++) { + _gettime(CLOCK_MONOTONIC, &tst, i); + if (abs(tst.tv_sec - now.tv_sec) > 5) + return pr_fail("%ld %ld\n", + now.tv_sec, tst.tv_sec); + } + + /* Check for proper vvar offsets after execve. */ + snprintf(now_str, sizeof(now_str), "%ld", now.tv_sec + OFFSET); + execve("/proc/self/exe", cargv, cenv); + return pr_perror("execve"); + } + + if (waitpid(pid, &status, 0) != pid) + return pr_perror("waitpid"); + + if (status) + ksft_exit_fail(); + + ksft_test_result_pass("exec\n"); + ksft_exit_pass(); + return 0; +}