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 E1F7CC001B0 for ; Tue, 4 Jul 2023 15:37:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 381D9280090; Tue, 4 Jul 2023 11:37:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 33169280076; Tue, 4 Jul 2023 11:37:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1AB8A280090; Tue, 4 Jul 2023 11:37:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 039AC280076 for ; Tue, 4 Jul 2023 11:37:18 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id B9EDEC0A5E for ; Tue, 4 Jul 2023 15:37:17 +0000 (UTC) X-FDA: 80974333314.25.E385AEA Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by imf15.hostedemail.com (Postfix) with ESMTP id D0DDBA001F for ; Tue, 4 Jul 2023 15:37:15 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=JOEPaz3v; spf=pass (imf15.hostedemail.com: domain of revest@chromium.org designates 209.85.221.43 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=1688485035; 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=rLVIku7SViX3h+Lcl0E/1oJd3wDCllnW/4/cStAOVU8=; b=L8lh+7XHyLhj88DfLhxV5nSL8pStM0dHenWREDxhPJHQa8YzlGZvTo3lcK1NeWwSWvXDoU WHx62hwWFqkfWjDagq9HCqFSZ0EYn/SR942c/d4QKugnNZxdhzu7h1Dvem11tiMcEGP1NK CjO8EErp+W98bJ2anebLVcX2Nq1YIzc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1688485035; a=rsa-sha256; cv=none; b=nuVjss8QME2R6lqweEQD52TsAqriFfsAAD00tNf0xluQOQ/47Ximdja+o72mrZlq8foi1H 4fDFo7UTANAXoArPZUjl0iTxHPbHJ6erJ9y1mBtQB3DSVesj9bXYJZ2mu+mIwTyTh2rFwI cu89vNsuOMa40dI6OPGWki8NOSpu0ok= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=JOEPaz3v; spf=pass (imf15.hostedemail.com: domain of revest@chromium.org designates 209.85.221.43 as permitted sender) smtp.mailfrom=revest@chromium.org; dmarc=pass (policy=none) header.from=chromium.org Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-3141c8a6f30so6007619f8f.1 for ; Tue, 04 Jul 2023 08:37:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1688485034; x=1691077034; 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=rLVIku7SViX3h+Lcl0E/1oJd3wDCllnW/4/cStAOVU8=; b=JOEPaz3vnVicEmuh0M2bGeQ1kl3GzOWIF49GpZl60KzO+GPWcT5dbD+wvseGGR0wpF IxOhrzyb0mInXy8d4183tOtH9SMwjHJhP23A8fyQrPc/56y0fXEdeGOra4JIsTvrhDEV wdGE+jVfHMmym/en2jJSDy3V5xHMkHz6rdQqU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688485034; x=1691077034; 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=rLVIku7SViX3h+Lcl0E/1oJd3wDCllnW/4/cStAOVU8=; b=MJ53NTvmde9UXsMO4o/ylqn+0mV39S6uezSdVK3h08hRoSkZZ2BHjad8fYTCebBuOt ojF5uR7b9wPXoAVq5m1Q8eOH13y3IBNZwi6d4OYfqddPjy1dvFh3egRZe/Lk/sgT8mKR wI9j036b6z6ua8tk+9FbHtN4OWk8w1akSYnRapoRl1WNbytYL7jyfSDXAxYAzf/VsHXa uyXne1NLIgPKkm6Rh47oxBlpk6KPCpdF8VOPqhha5Srm52VYwG2OdzJ2lSUiCPn+wqe7 nP88KGlDfMfHWytxxOX/MYN/mlhrUnMrAUU+yBA8qM686UtCiTwSvEU2sbiEwgy+dDvY Nerg== X-Gm-Message-State: ABy/qLbLs+5FCPKA4JMOX5fsn9X5pHKWnrmx4nO8t3lN2mFsz4sxeHtG IqVq/TyG4vLaQIOO3CRC/TFmIg== X-Google-Smtp-Source: APBJJlGPcUUIL7rFhoXERgudOfZJobL4dZUD8SGmsqpar9eStx2K5Uf+A1VwfXk9CRgRtCCc2GDieQ== X-Received: by 2002:a5d:6392:0:b0:314:37a2:5900 with SMTP id p18-20020a5d6392000000b0031437a25900mr5264050wru.14.1688485034312; Tue, 04 Jul 2023 08:37:14 -0700 (PDT) Received: from revest.zrh.corp.google.com ([2a00:79e0:9d:6:99b2:81bb:8407:5369]) by smtp.gmail.com with ESMTPSA id b2-20020adfde02000000b0030c4d8930b1sm28538709wrm.91.2023.07.04.08.37.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 08:37:13 -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 v3 5/5] kselftest: vm: Add tests for no-inherit memory-deny-write-execute Date: Tue, 4 Jul 2023 17:36:29 +0200 Message-ID: <20230704153630.1591122-6-revest@chromium.org> X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog In-Reply-To: <20230704153630.1591122-1-revest@chromium.org> References: <20230704153630.1591122-1-revest@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: 85rydytjc4cd4jdu5zx5jcc11ujqdtcx X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: D0DDBA001F X-Rspam-User: X-HE-Tag: 1688485035-153480 X-HE-Meta: U2FsdGVkX19uTu/nLjexYUwWK6gwOReisEC7xaWNRe6Zkj8LeN8GGQpYMAwwNvUIsz9dOUdLrWPvu7jNsfXqv05sGa/9pf0Yr90nZk3ZRQpSqR2jUk6UPwzOeoxSwO7KUSNM06lXD4l1EqmDbWQ546A0NiQvuBZU/79t3s041Lph4vTSmMIDXKdatQ2Bsbs4RyOdJb+RfTtkqstpKcLP69TWWg9XIs/PBTEFf3XseLL7rk4nJJ749jN07kPtbhCIUFZPZmDxcDjTqGVuRx7+edMDX3h5cOa3B8V8jI4j8e5rWnmFuSsCRqtEbLyX+bnRAlqy5EIxqttHJdnS4cSKBJw4chn1jLBow8vAx/ndyKCo+ZRdboA81B9ajnaqDnvVRWtjH+OCtDzedui3o3gPODAWFqfxPa89Z6fesKC0ZVOX6xPJQO6RU+yITa2kAZIc4s5xHh+AMH5+tnrcWjF9B+//Q3njmiYJnsj45h+6xNIlEuYEVBMS9Vf8mDDIz6l5KMzt96Rcv6oxNvJcxxV/wG4aJ8rqSbqA48uxkEgKOm6XZDj0TxvUiNDQcJLirXZq3cUXgyDJ/GpentvBckFg1qXfMKA3NovzvndDERF0xIa8+RwQAlc703ZxgtTdZZMR3Pk0Z9uvVPYtTamMp+gpSAY1w+FtSZkK7f5o/EeaynA6rUiiaHdGnLYLVZvdzgjKgv1csx56mQhpr94r4O0KlBCYDNG6I3j4yXZmCi8LjNwg+yqhTCHNnXw6P8UYADQbXUtyKx20NPrc36LI45q9Ui2dnzxFWPeQYaOWTYMacdP5eu2BxNyS3tFjdos3pRbmtJ0EjMPdvlkDifupOrJlE+UTjus86W56ztJf8IyA1n+gyjyb7WpHGlRBQcLJRVSv5+oVqnGXzHGFdUtJ1VVuaLph35DZ6RvaSl1572hqqQj5+EJBOVh4rZCSlSMw8xKSntrzY9+zAlFDl2y04zk h+yQAMnG DWnZntVPTq2S32f4YlVl21/gih7w9mYFL0Rn5FH7UoBwX3ktRsjuIXznuCIgLCx+Fe4KDWTpBygavRc/BfECvBRxjXHLq7p3pwWmTL5uhzHQnYeW2jyh3rbL9r/m/weLeCYe8rvrm7bf5aw8dFVEoH5MDqBe6rmmQHap/K7hk4tJ8C02T/cgTz9weLGMeYi+DIzTiBj81a4YydeqMa8vFdvCiAxSr5JIctLhapWNtHJo3ntCr+/X37pq01uAsg/xKMfDT1c9SSHKcUTtz09iXaoc0kQH2OyT2tMkfPXMv59Wm+j2RwsiXVmtZKJjmq+kFtyHBDd+2NZSbEONm4NBZO6OzW2hI8O1rlI7gsjDt1sXV8pq6D6FUhIM0jvvrlRey+1Kkn2d1mDFjXYWJy4yaRePkefGn6ZOsZfWF 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 Signed-off-by: Florent Revest --- tools/testing/selftests/mm/mdwe_test.c | 98 ++++++++++++++++++++++++-- 1 file changed, 92 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/mm/mdwe_test.c b/tools/testing/selftests/mm/mdwe_test.c index 91aa9c3099e7..7bfc98bf9baa 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,69 @@ 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, 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); + } +} + FIXTURE(mdwe) { void *p; @@ -45,28 +110,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 +158,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 +199,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 +225,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 +240,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.41.0.255.g8b1d071c50-goog