Received: by 2002:a05:6512:3d0e:0:0:0:0 with SMTP id d14csp15076lfv; Tue, 12 Apr 2022 15:20:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwjGriHksG+TUforBt+4pPgymFkqIsahpTdFH4oQNSxJtv5nhC9ievL1txhRcZg/jgHdiND X-Received: by 2002:a17:902:e889:b0:151:a56d:eb8f with SMTP id w9-20020a170902e88900b00151a56deb8fmr38523134plg.142.1649802029371; Tue, 12 Apr 2022 15:20:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649802029; cv=none; d=google.com; s=arc-20160816; b=cHD+WxzsZAIjLY8jgNs9Q2u0P27wFPsLZ+h46J1NECXDlxNzPKqLrtD9vBn5nWh+ld 1SFDtx9L6NHQEBpZGQBBLgbEjhO8ygbLNP5a2943Zf20iCiUZt7iR8elUNRi/+5el7DP 0PtpuusuL91O5ziX1pj/fqq646s4Y87gKCqDlZjYb7fvUjQq3UQ1J4QJ5SzlEEMJZDVI a1NwupD3mNkRRqBSguHr955t8pFhLKRfdqvR+yPdZ7rY+uzpYkYQvcCZyhaQomXAS8ZC dqs/eXNDBvnoVUXxV8pIT/g32OGLFKC3TUJ09bJoF8/R/kDOKS0psyAo492ae41VIdiy 5YbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=INulvIXSEA1epE+CfPZJf2KspPsWzfy9nGrrMlWMcEU=; b=FBWlVJJJtSHCjJwkYu6m6sq36vykqp3Np57C+TVgAZ2CyHwRTpN7BklEDMrNMIR6PA T0bpp1jmBtw6/yX9WeTa50RK2NUBhb+wiTgyApGduzbHKHdX//CjTficX+76heOns8AJ qCw6Mh92JPQt2bxjnWG/gZfUTZHfVlN4xCAiBZDCn9E/SCNZ0EA1g07rKXFqUQzp2NhE mgBoV2rcGwWFHZWJXA/+U9ek1C4X09LWxOTY8uQS/UhhiWVgPvDiafd8utf1przjb/lh L5ZiJHfEDRtXL3kRtbqh80mP1mamz4GsdennFqZWQU+NPSpx0woS9e+a9/7OUhRGVxbH kviA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=cEGawEv0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id j13-20020a170902da8d00b00154a965e488si6278215plx.237.2022.04.12.15.20.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 15:20:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=cEGawEv0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 98804D5EAB; Tue, 12 Apr 2022 14:01:09 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351757AbiDLHMx (ORCPT + 99 others); Tue, 12 Apr 2022 03:12:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351437AbiDLGxg (ORCPT ); Tue, 12 Apr 2022 02:53:36 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB5293CA4B; Mon, 11 Apr 2022 23:40:38 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 76749B81B49; Tue, 12 Apr 2022 06:40:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DCEEAC385A1; Tue, 12 Apr 2022 06:40:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649745636; bh=UG8E96NmWmyT1eR57RezFnkCYzgTjNbUM2DsOBIh/tU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cEGawEv0mzrFdrmsa2iIgQImuq7dy62ph/otoNdf/xa0TKcXo7wf57FMgSseZjiqb aPqnDpobfCZkKy4HZbWR7cQxUGnHtLrfh/HNbPYXvSMMwDyA6WLNeIv7YqakvtiWnH 3oobhEopz8+Vrq/gATLv0mGVCbLEtsDj4xsFqiMc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Michal=20Koutn=C3=BD?= , Tejun Heo , Ovidiu Panait Subject: [PATCH 5.10 166/171] selftests: cgroup: Test open-time cgroup namespace usage for migration checks Date: Tue, 12 Apr 2022 08:30:57 +0200 Message-Id: <20220412062932.704412068@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412062927.870347203@linuxfoundation.org> References: <20220412062927.870347203@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tejun Heo commit bf35a7879f1dfb0d050fe779168bcf25c7de66f5 upstream. When a task is writing to an fd opened by a different task, the perm check should use the cgroup namespace of the latter task. Add a test for it. Tested-by: Michal Koutný Signed-off-by: Tejun Heo Signed-off-by: Ovidiu Panait Signed-off-by: Greg Kroah-Hartman --- tools/testing/selftests/cgroup/test_core.c | 97 +++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) --- a/tools/testing/selftests/cgroup/test_core.c +++ b/tools/testing/selftests/cgroup/test_core.c @@ -1,11 +1,14 @@ /* SPDX-License-Identifier: GPL-2.0 */ +#define _GNU_SOURCE #include +#include #include #include #include #include #include +#include #include #include #include @@ -741,6 +744,99 @@ cleanup: return ret; } +struct lesser_ns_open_thread_arg { + const char *path; + int fd; + int err; +}; + +static int lesser_ns_open_thread_fn(void *arg) +{ + struct lesser_ns_open_thread_arg *targ = arg; + + targ->fd = open(targ->path, O_RDWR); + targ->err = errno; + return 0; +} + +/* + * cgroup migration permission check should be performed based on the cgroup + * namespace at the time of open instead of write. + */ +static int test_cgcore_lesser_ns_open(const char *root) +{ + static char stack[65536]; + const uid_t test_euid = 65534; /* usually nobody, any !root is fine */ + int ret = KSFT_FAIL; + char *cg_test_a = NULL, *cg_test_b = NULL; + char *cg_test_a_procs = NULL, *cg_test_b_procs = NULL; + int cg_test_b_procs_fd = -1; + struct lesser_ns_open_thread_arg targ = { .fd = -1 }; + pid_t pid; + int status; + + cg_test_a = cg_name(root, "cg_test_a"); + cg_test_b = cg_name(root, "cg_test_b"); + + if (!cg_test_a || !cg_test_b) + goto cleanup; + + cg_test_a_procs = cg_name(cg_test_a, "cgroup.procs"); + cg_test_b_procs = cg_name(cg_test_b, "cgroup.procs"); + + if (!cg_test_a_procs || !cg_test_b_procs) + goto cleanup; + + if (cg_create(cg_test_a) || cg_create(cg_test_b)) + goto cleanup; + + if (cg_enter_current(cg_test_b)) + goto cleanup; + + if (chown(cg_test_a_procs, test_euid, -1) || + chown(cg_test_b_procs, test_euid, -1)) + goto cleanup; + + targ.path = cg_test_b_procs; + pid = clone(lesser_ns_open_thread_fn, stack + sizeof(stack), + CLONE_NEWCGROUP | CLONE_FILES | CLONE_VM | SIGCHLD, + &targ); + if (pid < 0) + goto cleanup; + + if (waitpid(pid, &status, 0) < 0) + goto cleanup; + + if (!WIFEXITED(status)) + goto cleanup; + + cg_test_b_procs_fd = targ.fd; + if (cg_test_b_procs_fd < 0) + goto cleanup; + + if (cg_enter_current(cg_test_a)) + goto cleanup; + + if ((status = write(cg_test_b_procs_fd, "0", 1)) >= 0 || errno != ENOENT) + goto cleanup; + + ret = KSFT_PASS; + +cleanup: + cg_enter_current(root); + if (cg_test_b_procs_fd >= 0) + close(cg_test_b_procs_fd); + if (cg_test_b) + cg_destroy(cg_test_b); + if (cg_test_a) + cg_destroy(cg_test_a); + free(cg_test_b_procs); + free(cg_test_a_procs); + free(cg_test_b); + free(cg_test_a); + return ret; +} + #define T(x) { x, #x } struct corecg_test { int (*fn)(const char *root); @@ -757,6 +853,7 @@ struct corecg_test { T(test_cgcore_thread_migration), T(test_cgcore_destroy), T(test_cgcore_lesser_euid_open), + T(test_cgcore_lesser_ns_open), }; #undef T