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 DD80BC83F11 for ; Mon, 28 Aug 2023 15:09:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 75CF38E0026; Mon, 28 Aug 2023 11:09:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 70B1B8E001A; Mon, 28 Aug 2023 11:09:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 58A978E0026; Mon, 28 Aug 2023 11:09:19 -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 43D3C8E001A for ; Mon, 28 Aug 2023 11:09:19 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 1D579120251 for ; Mon, 28 Aug 2023 15:09:19 +0000 (UTC) X-FDA: 81173846838.05.B23CCBD Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by imf05.hostedemail.com (Postfix) with ESMTP id 43A88100024 for ; Mon, 28 Aug 2023 15:09:17 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=Gcfsc20e; spf=pass (imf05.hostedemail.com: domain of revest@chromium.org designates 209.85.128.48 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=1693235357; 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=gkrzJ6nrXmVMKGdRpiGhMw2iKfFp7Za5H8zwt1x/uYE=; b=fXJWB93naxfCtBik48mWRGT5xo1Dwx8v/GBtTLsma258rCrRjUpwveEpSbzssceak4IKtA htNMeen6lSxtQzHYKFdbj3duN5UU272KpEIR1K0k01cJvhP2fTRbbE1qD+CRP+Ye/TVi/R trUdvTU/36uPBsfUvsKYULgVPDBsOaM= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=Gcfsc20e; spf=pass (imf05.hostedemail.com: domain of revest@chromium.org designates 209.85.128.48 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=1693235357; a=rsa-sha256; cv=none; b=Mq+Y8BLfsce15qgAyX57zg3LOTnshVlv6N2z8UtotbMufUmBXh4iIY/+VplmKx5Iy28umO zfKker3p5GtcSjLISKih9lP7tz5bH5BdCUP9ivBRi2HNB124MLQHoLxIBen5okjxzZDUjh dFUWruRPlZiLIPTAEdPIW3BOFJHLDCw= Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-401b0d97850so32190155e9.2 for ; Mon, 28 Aug 2023 08:09:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1693235356; x=1693840156; 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=gkrzJ6nrXmVMKGdRpiGhMw2iKfFp7Za5H8zwt1x/uYE=; b=Gcfsc20eRAp56OKEVtMEAhiDJbVxd/eH0D9DHi7azczCvXZzjwAaYRmxarKUIMR+vQ 2XanoZWuX5BE9LnjXukHoeIX3vcDykgOXzBvFzYHi1NfOQfyLIgn3bbw3Ck9WAwB0Isi 39eyQXmVEHzX3V6dpy2y9FTf1Yo/Bpgl5L9hw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693235356; x=1693840156; 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=gkrzJ6nrXmVMKGdRpiGhMw2iKfFp7Za5H8zwt1x/uYE=; b=i3+Ch54ep9lY9TBEuBPWX/891YF+kyBb/io1aCGtOi6t+q9/zWrXI/WoRowBNIWfZY HmkzRQD9qDADxSuwoCUMId3avAxk4KL1aawEvpN6iKmD2OOJyoeGq5bB/Dw5Z8aDdiZR iOTceUy3lT82FmoGVFYGq0+lF7gz/bSv+jvT4A5Sv+C3LztKcWK4O/+ds3+S8Me09b/d JlOM/Fr/ylzsyywYydAX3e9A70zBJJybrAHvl5ohEPCb7LE979GcuU6rGegrE0+Gbqu0 4TYHshyYBc/T8Gxgjq4szLo/ajCssBYft0dmt5EX4eQV91jE/HsRJe7xOCfnfu7db7Ko OqzQ== X-Gm-Message-State: AOJu0YykAuuer8eIYsFBtsuXFeEocSAY3aFp+Aya6qOZKT7GjKf+elaW 5sJbYjUHDax1bXvy1W1YLdSTIO490E4SKrwLIm8= X-Google-Smtp-Source: AGHT+IFPERDSa8GnxhdBv9hLnJGAV2jLF6UJnAF68SaqVArOPcEFQgITwMNi2q83UONR6SeCgjDrOA== X-Received: by 2002:a7b:ce91:0:b0:401:4542:5edf with SMTP id q17-20020a7bce91000000b0040145425edfmr9094986wmj.0.1693235356077; Mon, 28 Aug 2023 08:09:16 -0700 (PDT) Received: from revest.zrh.corp.google.com ([2a00:79e0:9d:6:40c6:6cff:63b:c70a]) by smtp.gmail.com with ESMTPSA id v3-20020a5d43c3000000b003140fff4f75sm10730522wrr.17.2023.08.28.08.09.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Aug 2023 08:09:15 -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, ayush.jain3@amd.com, Florent Revest Subject: [PATCH v4 6/6] kselftest: vm: Add tests for no-inherit memory-deny-write-execute Date: Mon, 28 Aug 2023 17:08:58 +0200 Message-ID: <20230828150858.393570-7-revest@chromium.org> X-Mailer: git-send-email 2.42.0.rc2.253.gd59a3bf2b4-goog In-Reply-To: <20230828150858.393570-1-revest@chromium.org> References: <20230828150858.393570-1-revest@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 43A88100024 X-Rspam-User: X-Stat-Signature: prf3emj7199gpqk5idf3547ymfmsmb3j X-Rspamd-Server: rspam01 X-HE-Tag: 1693235357-905345 X-HE-Meta: U2FsdGVkX19TgitFokfUemPvjBQwzOwJJfG8nNHLAsg1jVASF7olU6eT9tFJGOar7iedOgKd0nuJUKs+0mtpUWhoelsBqG3CvgjCjQIKR+myeryRhHxrA13UlD/mZHqKhHOHKo2MbITll76TJLEMnuySMpiw1+iOER8MZrI3A8FntAK2ajI3JaqeUdyDWVpBXpzeQBIxed5M+MBnUyijD7qLVpb2uMSzF7aERY2cZ69QCjaZ2EqRemskmhYpHPyD65YBdct2YX87j53ulkC6TfwH/RddORsaU8dAUkwVygGJerBjGvdyTW+ra/mragi+CwP9SMHGZ4vF84XYUYnihqe5ksIRCNPcfnF2Q2c/MylkfkN0xCJPxvjVyQDN+KgawVp0LLiVlZIEw27Tc1/MTkPu+faHBucYlx4+U1OeDmDEE/cpyQbkFuSMNp2lollCm4KP0YOlkRJlGcDPboyue8Q+2sehLvuoi/1rxNFknEJnRQjdAHFcgUY8HAgW/Bo7Ac9SiFUVcmG19wH6w0zYZQRkmJ6DpgcwdBkzX/WhFWKJIQYbB5kY7kt06Mt+q33kHvRC/EzKzzLwd/W52JHQyWxDRoGSXXwj017ROw+dPOdJJ1k5CU8mmK8yYWQ8i9G8B+SUNiPLBd/+IaIo/IpPcQZvmu2aTISah7p0vZpOOnPe7U5nHm4LzXpT9Y96OVbdT6F56g4yt8a23x66KiQ3UWXkifrXsqCD2or8tMLvzJO8sZ8wKP/msDMz7k2RCLDHUBo3gMYjlJ1hEgFCmRc1HzUGK02Uzg47WPChWQeHpQGvv0/JX44IAN9R/4gy4kC7OdZlMPbuRcMLTAsrmuLwPxA77QaT0AQJdzAG/eMAiF36IwyXgx8hZ1KWEYbpQGEOE5eVUX1YOgSyAE3xun1GUwYsbxuB1fLxeh0fIRunRlGgYZFpMkxU4ZwYlCp05AMPAaknHHS01v07dWiNoU9 4CWBBjFn oqWm7lJ9BkYkmvEpoEec797JoFpiLHWQFujKWwHJ6edEu7Be1gS4cTuRDjVF1a3vvvmpy8j9H91jYBD259JCHoNtqXE1P9MQKPkpTG7BcPaPhKawrNmxwubNFffhINBQT6pTjEWyKIN9ZrZ7kqoMDpI3vTFBTAxSTXhUZ17tijqt1/MamkJsARvRzng1dLRVF6QGJ78jbQJdZc9O+cvGA9qUqOeYYOH7hKdYrkObx7gaCbuGong6E3/sNHi2mT/sbA3Aheqd44vKtEFSknhYPmGS/MUjCD5hA+t00WVt831sOvB4I81uI0PuzzaccoqYRrxtUHAmxmbI6DaR9ig7jnDTrYRoA7AABJkK6YJ1mPB2Ql2qB4K8RUX+/tY1+jpQ5T7UTMlToINPR4Bn9VqnunAHN2Kc6GNT0DbGedDSVup5f7aGQN9SaMos259TFtAkZd6t3 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. Check that: - it can't be set without PR_SET_MDWE - MDWE flags can't be unset - when set, PR_SET_MDWE doesn't propagate to children Acked-by: Catalin Marinas Signed-off-by: Florent Revest --- tools/testing/selftests/mm/mdwe_test.c | 114 +++++++++++++++++++++++-- 1 file changed, 108 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/mm/mdwe_test.c b/tools/testing/selftests/mm/mdwe_test.c index 1b84cf8e1bbe..200bedcdc32e 100644 --- a/tools/testing/selftests/mm/mdwe_test.c +++ b/tools/testing/selftests/mm/mdwe_test.c @@ -22,6 +22,9 @@ TEST(prctl_flags) { + EXPECT_LT(prctl(PR_SET_MDWE, PR_MDWE_NO_INHERIT, 0L, 0L, 7L), 0); + EXPECT_EQ(errno, EINVAL); + EXPECT_LT(prctl(PR_SET_MDWE, 7L, 0L, 0L, 0L), 0); EXPECT_EQ(errno, EINVAL); EXPECT_LT(prctl(PR_SET_MDWE, 0L, 7L, 0L, 0L), 0); @@ -41,6 +44,84 @@ TEST(prctl_flags) EXPECT_EQ(errno, EINVAL); } +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, can_keep_no_flags) +{ + .first_flags = 0, + .second_flags = 0, + .should_work = true, +}; + +FIXTURE_VARIANT_ADD(consecutive_prctl_flags, can_keep_exec_gain) +{ + .first_flags = PR_MDWE_REFUSE_EXEC_GAIN, + .second_flags = PR_MDWE_REFUSE_EXEC_GAIN, + .should_work = true, +}; + +FIXTURE_VARIANT_ADD(consecutive_prctl_flags, can_keep_both_flags) +{ + .first_flags = PR_MDWE_REFUSE_EXEC_GAIN | PR_MDWE_NO_INHERIT, + .second_flags = PR_MDWE_REFUSE_EXEC_GAIN | PR_MDWE_NO_INHERIT, + .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, cant_disable_no_inherit) +{ + .first_flags = PR_MDWE_REFUSE_EXEC_GAIN | PR_MDWE_NO_INHERIT, + .second_flags = PR_MDWE_REFUSE_EXEC_GAIN, + .should_work = false, +}; + +FIXTURE_VARIANT_ADD(consecutive_prctl_flags, cant_enable_no_inherit) +{ + .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); + + ret = prctl(PR_GET_MDWE, 0L, 0L, 0L, 0L); + ASSERT_EQ(ret, variant->second_flags); + } else { + EXPECT_NE(ret, 0); + ASSERT_EQ(errno, EPERM); + } +} + FIXTURE(mdwe) { void *p; @@ -53,28 +134,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; @@ -84,13 +182,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(); @@ -121,7 +223,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); @@ -147,7 +249,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); @@ -162,7 +264,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.42.0.rc2.253.gd59a3bf2b4-goog