From mboxrd@z Thu Jan 1 00:00:00 1970 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 609F9C77B75 for ; Wed, 17 May 2023 15:05:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EEF99900007; Wed, 17 May 2023 11:05:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E9EDB900003; Wed, 17 May 2023 11:05:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D3F66900007; Wed, 17 May 2023 11:05:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id BFED6900003 for ; Wed, 17 May 2023 11:05:00 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 8DAB5A0607 for ; Wed, 17 May 2023 15:05:00 +0000 (UTC) X-FDA: 80800069560.11.1632CA9 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by imf04.hostedemail.com (Postfix) with ESMTP id 9AE3B400EF for ; Wed, 17 May 2023 15:03:55 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=VOiuLe3b; spf=pass (imf04.hostedemail.com: domain of revest@chromium.org designates 209.85.221.45 as permitted sender) smtp.mailfrom=revest@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684335837; 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=XZna8pJSuLGWyf+gz4k0SP+q2QXja3naQzgW+6vcrp4=; b=jkylfifN3WjUPSxV+syaRSUrHR4uLaBcMXo3cwZ9DdIr5Vf/hA1K07eUDK7HsIEjv5oOiY /aACntRDi+IFnub4oTv5WGRI5qKvIz8LX6bfdOo2ip0d4NrQIZGwSH/4vAeDh/0BBaAE6s br2mHPdZpRykcIk4SF4+BbfCb04L/iI= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=VOiuLe3b; spf=pass (imf04.hostedemail.com: domain of revest@chromium.org designates 209.85.221.45 as permitted sender) smtp.mailfrom=revest@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684335837; a=rsa-sha256; cv=none; b=M26V+YYxL8PU0npwohFvbE1LqHGtrIShMaviLpu1qU0+24/IU+P/lzXerxsBfyftKmoQ5K NiDJ+rMr5T45JmGNCxR/bEeYYfuCZMQMYKksFdaP89Pd/PBOv+iwpJQ76zmvNJQDAPVcNJ M/iujYxvcVQ1gKag/Hb2Xe9slEbpn3U= Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-307d58b3efbso633769f8f.0 for ; Wed, 17 May 2023 08:03:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1684335835; x=1686927835; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XZna8pJSuLGWyf+gz4k0SP+q2QXja3naQzgW+6vcrp4=; b=VOiuLe3bG4vHmfbabe07F3nlpYx08FfV/3zQLCyMZi11R5cM1HKH5T65JN6ugqyHwi G99lvNgNYrIk8eHNaql93JvIcv3h0iKEaBhgawogRCgZMmftz/RTh2Bf/JXFZ7nUlRzk EK6wmUgGQj7vyyj5mggmdbjXb8QJLmSkQc7OE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684335835; x=1686927835; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XZna8pJSuLGWyf+gz4k0SP+q2QXja3naQzgW+6vcrp4=; b=lIzGY/xWCp4wJ+OVUY+RBdmxKbXwfMYfVuprpPuLtxewqcX/DeEpri1woVBFmqRF4e a4ungWbOsSRZh/mXBuuYrgtHJM/FlwNHgOd2axs2sThJTR9fs3ek/bnExKFLaF32cZBs HYz1UVQoGxXYlUdUC24mhc99fm+1PXKmCpDlGUclS4xRSJP/SFWvhkoTE2LBKrvl8af1 u1tRH71Hmki07LCuCe3+Wprxroa3LKEkgzjdTmh/Q9V6vGYZc1x1anxF0+9Rp1RWKTGO 1Gje+XeyVWVeh4uRxH2jUx8Y2MuCQ6z7b3No462FwsjjzKj0qycU4tQ7zdYSOITMB54f Fx+A== X-Gm-Message-State: AC+VfDzD01tLGBq6j4WTyH50cq9TSdtMKHcU65lb5dDNCJ9+Q2IlMIiV T9gDhCcXIj8w+qDGENQPTrOHlw== X-Google-Smtp-Source: ACHHUZ6T1L/yncZ7b+WXlzAW8H3qe+guQ3irQhoWzDHtSFqs+sp2uaTY/rDwi1XNPs007HDwmTeTjg== X-Received: by 2002:adf:ee89:0:b0:306:2979:8ab0 with SMTP id b9-20020adfee89000000b0030629798ab0mr1017312wro.24.1684335834709; Wed, 17 May 2023 08:03:54 -0700 (PDT) Received: from revest.zrh.corp.google.com ([2a00:79e0:9d:6:e223:a0c2:d2c:c371]) by smtp.gmail.com with ESMTPSA id e17-20020adffd11000000b003047ea78b42sm3038211wrr.43.2023.05.17.08.03.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 May 2023 08:03:54 -0700 (PDT) From: Florent Revest To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: akpm@linux-foundation.org, catalin.marinas@arm.com, anshuman.khandual@arm.com, joey.gouly@arm.com, mhocko@suse.com, keescook@chromium.org, david@redhat.com, peterx@redhat.com, izbyshev@ispras.ru, broonie@kernel.org, szabolcs.nagy@arm.com, kpsingh@kernel.org, gthelen@google.com, toiwoton@gmail.com, Florent Revest Subject: [PATCH v2 5/5] kselftest: vm: Add tests for no-inherit memory-deny-write-execute Date: Wed, 17 May 2023 17:03:21 +0200 Message-ID: <20230517150321.2890206-6-revest@chromium.org> X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog In-Reply-To: <20230517150321.2890206-1-revest@chromium.org> References: <20230517150321.2890206-1-revest@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 9AE3B400EF X-Stat-Signature: gmmpt9h377pags9rwkzu6a5yrszoq95w X-HE-Tag: 1684335835-48714 X-HE-Meta: U2FsdGVkX1/b02shK9gpHpH5CKIspCMNS/+AopEY8qLjIKyxCE0SLIs7+OxhMPEpWVqlFTzfLjGSgH8iFarQU+1NbgtBLNUQ3B8d1q941Lf1asHzjwF9pKc1wmbBAmrAGYu7GkbkwrJ+5Psa+Y3WL3hBg91MPTHlTZtligYscfhXI4aKDvDJS22R6pB9E14FpvqhCOfvEleU4wloLRCE+aFhcZU9enrcNRY6sxskM+q+q2uWFVMfKBhE0K9w9VhECd6AgfnrOZ0ieIgr6sjyXdsNPMSNe4od+wcm1OgJTIhrPd3p8gS1Ap4cSu9obATwTHX/yVXbG014KfqPXaMK9mGlqu5q3rjjmZaLb4g7u28QfAntlg3hhMukqlwv87p6uX8BOjLCZhdrFcXjySHGoIXpMesFEBZ1iNWk17CC+cAXTMY9c046YGdxTLWpooc5TP59NhUKEgauW3bO4lj4CzGIhXKmY0Ford5uU7A7oXruMZC2oWvy6ekg0y+2vvGUHZhKwNvhwpJL8GEFt4zugrMb4Lmblc6AzcLphoBTbLBHU/xqxVelb/kRg/br4WzKLptSNjo9viMaFPZrWdFkfA5rz89Z2yLtBqSmoFCiwDNuApFPsCjR7J/PP7QMlCiLAgJ9W5cbn71Z/EmWX/ruAYVfgzfUWvwxlyyIXs+Jtvg2W8Aisd+LTD2Xr6eybk6TX5hmaLYzQVuBksXTNjmVD+2m8qC7YPOYSRCfXVCP2Vj+Y51Bk1pnpWyEs9QJT7aZD2cNwZMcmFemfSWWGePayIS+AG0PpO4cZEZkza7TxEuQ5mrCfAkfrVgh+vQd9LVSpZT+Hv3EaPXQFGtzGeVi8cGw+9BcTBp2VbGZ6HT3v8yD0K59jJ1r9UyYaadAuM2GfwXiD0kTnyFjR1YZ++m386xn2XKFZ6oXwtzpZNKVCbdz5Tk/gpQWEbNzlmBwZb+39IEOLKuTMlbbgIIj3DA rFzKUkNa zNvbnUpPVa53jFqlo00cF/PsziRNQjciPB+j8u8del1Iidz6+x+YndqDpf9Ijf9NMd4CShvSfWulyJCWJ+HncKNms/JbXHQt7AQ6XG7PCvcgnVskIbJSU6qUtBiPn4mW6Ns7WtILlm1hQVzVuibSoZjV30zHMTUi4soLJ2YtMqjtgYft8ycOoVeqPRJKUkYF86KEMdLMN8zN9FC5b2Gj+nZEFlzrZqBUhRIXJR2+cLa9ZSN0bOzLLY86hCD70UBIkwLHp/uiN+wyYgVzARADvFadTOcipYiCdM+LPWml6nG92Df0W4/pk9qDdjPYrb1ft+x8GAMIFw/Y7b9aFf21E723o0IoXGTrMKSzoGFnekc/1KVeILiBOWSwcH6UDn40Ima68CFOiB34aGjhxVMsJ0dFphRxp1FHvVcQM 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: Add some tests to cover the new PR_MDWE_NO_INHERIT flag of the PR_SET_MDWE prctl. Signed-off-by: Florent Revest --- tools/testing/selftests/mm/mdwe_test.c | 95 ++++++++++++++++++++++++-- 1 file changed, 89 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/mm/mdwe_test.c b/tools/testing/selftests/mm/mdwe_test.c index 91aa9c3099e7..9f08ed1b99ae 100644 --- a/tools/testing/selftests/mm/mdwe_test.c +++ b/tools/testing/selftests/mm/mdwe_test.c @@ -22,6 +22,8 @@ TEST(prctl_flags) { + EXPECT_LT(prctl(PR_SET_MDWE, PR_MDWE_NO_INHERIT, 0L, 0L, 7L), 0); + EXPECT_LT(prctl(PR_SET_MDWE, 7L, 0L, 0L, 0L), 0); EXPECT_LT(prctl(PR_SET_MDWE, 0L, 7L, 0L, 0L), 0); EXPECT_LT(prctl(PR_SET_MDWE, 0L, 0L, 7L, 0L), 0); @@ -33,6 +35,66 @@ TEST(prctl_flags) EXPECT_LT(prctl(PR_GET_MDWE, 0L, 0L, 0L, 7L), 0); } +FIXTURE(consecutive_prctl_flags) {}; +FIXTURE_SETUP(consecutive_prctl_flags) {} +FIXTURE_TEARDOWN(consecutive_prctl_flags) {} + +FIXTURE_VARIANT(consecutive_prctl_flags) +{ + unsigned long first_flags; + unsigned long second_flags; + bool should_work; +}; + +FIXTURE_VARIANT_ADD(consecutive_prctl_flags, same) +{ + .first_flags = PR_MDWE_REFUSE_EXEC_GAIN, + .second_flags = PR_MDWE_REFUSE_EXEC_GAIN, + .should_work = true, +}; + +FIXTURE_VARIANT_ADD(consecutive_prctl_flags, cant_disable_mdwe) +{ + .first_flags = PR_MDWE_REFUSE_EXEC_GAIN, + .second_flags = 0, + .should_work = false, +}; + +FIXTURE_VARIANT_ADD(consecutive_prctl_flags, cant_disable_mdwe_no_inherit) +{ + .first_flags = PR_MDWE_REFUSE_EXEC_GAIN | PR_MDWE_NO_INHERIT, + .second_flags = 0, + .should_work = false, +}; + +FIXTURE_VARIANT_ADD(consecutive_prctl_flags, can_lower_privileges) +{ + .first_flags = PR_MDWE_REFUSE_EXEC_GAIN | PR_MDWE_NO_INHERIT, + .second_flags = PR_MDWE_REFUSE_EXEC_GAIN, + .should_work = true, +}; + +FIXTURE_VARIANT_ADD(consecutive_prctl_flags, cant_gain_privileges) +{ + .first_flags = PR_MDWE_REFUSE_EXEC_GAIN, + .second_flags = PR_MDWE_REFUSE_EXEC_GAIN | PR_MDWE_NO_INHERIT, + .should_work = false, +}; + +TEST_F(consecutive_prctl_flags, two_prctls) +{ + int ret; + + EXPECT_EQ(prctl(PR_SET_MDWE, variant->first_flags, 0L, 0L, 0L), 0); + + ret = prctl(PR_SET_MDWE, variant->second_flags, 0L, 0L, 0L); + if (variant->should_work) { + EXPECT_EQ(ret, 0); + } else { + EXPECT_NE(ret, 0); + } +} + FIXTURE(mdwe) { void *p; @@ -45,28 +107,45 @@ FIXTURE_VARIANT(mdwe) { bool enabled; bool forked; + bool inherit; }; FIXTURE_VARIANT_ADD(mdwe, stock) { .enabled = false, .forked = false, + .inherit = false, }; FIXTURE_VARIANT_ADD(mdwe, enabled) { .enabled = true, .forked = false, + .inherit = true, }; -FIXTURE_VARIANT_ADD(mdwe, forked) +FIXTURE_VARIANT_ADD(mdwe, inherited) { .enabled = true, .forked = true, + .inherit = true, }; +FIXTURE_VARIANT_ADD(mdwe, not_inherited) +{ + .enabled = true, + .forked = true, + .inherit = false, +}; + +static bool executable_map_should_fail(const FIXTURE_VARIANT(mdwe) *variant) +{ + return variant->enabled && (!variant->forked || variant->inherit); +} + FIXTURE_SETUP(mdwe) { + unsigned long mdwe_flags; int ret, status; self->p = NULL; @@ -76,13 +155,17 @@ FIXTURE_SETUP(mdwe) if (!variant->enabled) return; - ret = prctl(PR_SET_MDWE, PR_MDWE_REFUSE_EXEC_GAIN, 0L, 0L, 0L); + mdwe_flags = PR_MDWE_REFUSE_EXEC_GAIN; + if (!variant->inherit) + mdwe_flags |= PR_MDWE_NO_INHERIT; + + ret = prctl(PR_SET_MDWE, mdwe_flags, 0L, 0L, 0L); ASSERT_EQ(ret, 0) { TH_LOG("PR_SET_MDWE failed or unsupported"); } ret = prctl(PR_GET_MDWE, 0L, 0L, 0L, 0L); - ASSERT_EQ(ret, 1); + ASSERT_EQ(ret, mdwe_flags); if (variant->forked) { self->pid = fork(); @@ -113,7 +196,7 @@ TEST_F(mdwe, mmap_READ_EXEC) TEST_F(mdwe, mmap_WRITE_EXEC) { self->p = mmap(NULL, self->size, PROT_WRITE | PROT_EXEC, self->flags, 0, 0); - if (variant->enabled) { + if (executable_map_should_fail(variant)) { EXPECT_EQ(self->p, MAP_FAILED); } else { EXPECT_NE(self->p, MAP_FAILED); @@ -139,7 +222,7 @@ TEST_F(mdwe, mprotect_add_EXEC) ASSERT_NE(self->p, MAP_FAILED); ret = mprotect(self->p, self->size, PROT_READ | PROT_EXEC); - if (variant->enabled) { + if (executable_map_should_fail(variant)) { EXPECT_LT(ret, 0); } else { EXPECT_EQ(ret, 0); @@ -154,7 +237,7 @@ TEST_F(mdwe, mprotect_WRITE_EXEC) ASSERT_NE(self->p, MAP_FAILED); ret = mprotect(self->p, self->size, PROT_WRITE | PROT_EXEC); - if (variant->enabled) { + if (executable_map_should_fail(variant)) { EXPECT_LT(ret, 0); } else { EXPECT_EQ(ret, 0); -- 2.40.1.606.ga4b1b128d6-goog