From patchwork Thu Oct 18 06:59:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 10646779 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 159DA109C for ; Thu, 18 Oct 2018 06:59:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 090F8287BB for ; Thu, 18 Oct 2018 06:59:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F07F8287F4; Thu, 18 Oct 2018 06:59:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A376287BB for ; Thu, 18 Oct 2018 06:59:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 962976B0266; Thu, 18 Oct 2018 02:59:21 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8E70B6B026A; Thu, 18 Oct 2018 02:59:21 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 764A96B0269; Thu, 18 Oct 2018 02:59:21 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by kanga.kvack.org (Postfix) with ESMTP id 308B16B0010 for ; Thu, 18 Oct 2018 02:59:21 -0400 (EDT) Received: by mail-pl1-f200.google.com with SMTP id w12-v6so10572750plp.9 for ; Wed, 17 Oct 2018 23:59:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=/VyGfWQacueEUHTGPoQ3uFdYU/4GyGaHaoBL4dBXqp8=; b=UMjyCBYAMo+4sLwrJyp5k4UZsS+l+Vnlff8QjhKp3/GQXOK38rBNq5L1VLA5b11rji 72DKtQIOOClnXOgG79ZJGjLL87qZMRIM6YgxKVDvAVpMmmKCwMkLMbE28U0FcZRHnduT dktVkYMZ9Jkf5yVdi3X4l85ai5PolniUT77WDg1hYsgdg9TLdUnvE9R0sg0DK3F9ZI5+ Q/X50+Xw6uGIpIjr8qmCECkWQ3SPBZDtaBpBaBQpfMaXddaX27ugqe5Yz7jo1iHUtEMH xv8nNlllOEzpPWF5hNT5ftyH/ybNBPhU2BF7zDdLmjgemGXHg6hUfuVx7rnx24KDPHDG onpw== X-Gm-Message-State: ABuFfogIgyaSTC3tfclPZFrU6GUngdkh0tVfrxs2D/G9pcEz3WtlBW6h Ksy+X3DSrB8IhpTcgpvsnP0k7QK9M7mcYI8qdlAJp8Uebv9knR7gpXEPzm5NECkXDlCIyZiNMAG NkW7doWbkzD7HphIRGvJM3C4yVoJ02u/8pEGpHuztVuCRFfQ1KCQmbYcipVkg1ueCp/I3RKyle1 Mo9FqnXoqDriE9kc//pjIkNXfID83+/URTMkGuIOVyX+xKLoOfNyteZQuqfz27kRpgEsk1H7s9O XDQwPIvQrnQSZu+8gRmueP+Ma3FoSXFN3ER/Ka/JmL1VC8duCP6xxv22DVF39xWhoKd0LB6LIRI TkY6A5JuRUTjCTsaIGq24z5yO9nebDdG3iBsPrHfs0+ftX1NhQo0V0bSQRVZKd5PZYVGz9he1rh Y X-Received: by 2002:a65:5508:: with SMTP id f8-v6mr27451883pgr.240.1539845960859; Wed, 17 Oct 2018 23:59:20 -0700 (PDT) X-Received: by 2002:a65:5508:: with SMTP id f8-v6mr27451858pgr.240.1539845960064; Wed, 17 Oct 2018 23:59:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539845960; cv=none; d=google.com; s=arc-20160816; b=hByY7x9pvgE+YQQGfeJ04ur4F7uKafre6DXAyxzWpXMr/GovKTaWb6PO9FZZuzEgZv 4+gfImSdNhS6WmjSryIrjxnt+90J9Ct5VH9vDvrkiK+h+mbcZJ7837JDZgbFqc4tyLHX DT0C2p3jIQDjY2xsTavhUp7XR6yHcs7ndS5FVsTTo24O0cPOsTRQqWO76++SqwMkSm5y tJ1tFUgI+WOg+PIzKlwE1nUSzjYnByhexiI4iWTOjgb7+8yux83epWpjUPgUiHViKbUR /q4U/kHTUtUKaryZgYxiqFA/xfGM1GimT/F8Ybt0a3vvjubtULRliJ37RcbMTCGaFVoP cVag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=/VyGfWQacueEUHTGPoQ3uFdYU/4GyGaHaoBL4dBXqp8=; b=rfJyFcJMP9EVB6MirQ6ekbboOD9r0tzePGb2fAqwvPwCfCIY7EXjSJcdIie+Pxj8x9 Yh1QfqQnB/zPCdGgT/axy7l6Y8uRGpwF6Kta0k1EJdb2oF+Ckp5aH4qv4cc7Pm6rQTxX pjkop2i6c0sroD0sce1ZaTrJUkkGKw6TgiXN6P6hMwbJBu14Ko4uK9ns6cmtYRr5WFbW F6cvJtCFMTBv6WWPIMm0ktivnysb8gYAjA7UoBywY0THHwml0phIzCbfu/oizMS1Ph7P ZJ6pIqGFyEf4+JAZQflaHPtSFImKCsBUjrRRUOe0QdnpTDLUpUd2nZU5pO4a9CQYYuKL nanw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@joelfernandes.org header.s=google header.b=DfksOTMP; spf=pass (google.com: domain of joel@joelfernandes.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=joel@joelfernandes.org Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id j189-v6sor1410320pgd.42.2018.10.17.23.59.19 for (Google Transport Security); Wed, 17 Oct 2018 23:59:20 -0700 (PDT) Received-SPF: pass (google.com: domain of joel@joelfernandes.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@joelfernandes.org header.s=google header.b=DfksOTMP; spf=pass (google.com: domain of joel@joelfernandes.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=joel@joelfernandes.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/VyGfWQacueEUHTGPoQ3uFdYU/4GyGaHaoBL4dBXqp8=; b=DfksOTMPnGLSt+/RZVbtrmZH+aUqtKZ9anz+d0UFot8eCfcdCf686Kgfs2EwSZu5tI /paN5Ys1hMjJp+YCZH1bFHtPB2OgWbeFXPV3FmFTN9aWRdsDYc5RgLoKzciA+gXwfIw/ JIgYuws1P9Eb1SydvkYErc+X99w9lMAz/+IyQ= X-Google-Smtp-Source: ACcGV61MVMwfFrq1iY6mCNrXqt8vwRjugldQxLhW5AVm7ZVRL/BogArhefTux89TWrApAiEACQS/Uw== X-Received: by 2002:a63:7044:: with SMTP id a4-v6mr27475186pgn.63.1539845959538; Wed, 17 Oct 2018 23:59:19 -0700 (PDT) Received: from joelaf.mtv.corp.google.com ([2620:0:1000:1601:3aef:314f:b9ea:889f]) by smtp.gmail.com with ESMTPSA id r23-v6sm21580750pfh.79.2018.10.17.23.59.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Oct 2018 23:59:18 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: kernel-team@android.com, "Joel Fernandes (Google)" , dancol@google.com, minchan@kernel.org, Al Viro , Andrew Morton , gregkh@linuxfoundation.org, "J. Bruce Fields" , Jeff Layton , John Stultz , jreck@google.com, linux-fsdevel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, marcandre.lureau@redhat.com, Mike Kravetz , Shuah Khan , Thomas Gleixner , tkjos@google.com Subject: [PATCH v3 2/2] selftests/memfd: Add tests for F_SEAL_FS_WRITE seal Date: Wed, 17 Oct 2018 23:59:08 -0700 Message-Id: <20181018065908.254389-2-joel@joelfernandes.org> X-Mailer: git-send-email 2.19.1.331.ge82ca0e54c-goog In-Reply-To: <20181018065908.254389-1-joel@joelfernandes.org> References: <20181018065908.254389-1-joel@joelfernandes.org> MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP Add tests to verify sealing memfds with the F_SEAL_FS_WRITE works as expected. Cc: dancol@google.com Cc: minchan@kernel.org Reviewed-by: John Stultz Signed-off-by: Joel Fernandes (Google) --- tools/testing/selftests/memfd/memfd_test.c | 74 ++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/tools/testing/selftests/memfd/memfd_test.c b/tools/testing/selftests/memfd/memfd_test.c index 10baa1652fc2..32b207ca7372 100644 --- a/tools/testing/selftests/memfd/memfd_test.c +++ b/tools/testing/selftests/memfd/memfd_test.c @@ -692,6 +692,79 @@ static void test_seal_write(void) close(fd); } +/* + * Test SEAL_FUTURE_WRITE + * Test whether SEAL_FUTURE_WRITE actually prevents modifications. + */ +static void test_seal_future_write(void) +{ + int fd; + void *p; + + printf("%s SEAL-FUTURE-WRITE\n", memfd_str); + + fd = mfd_assert_new("kern_memfd_seal_future_write", + mfd_def_size, + MFD_CLOEXEC | MFD_ALLOW_SEALING); + + p = mfd_assert_mmap_shared(fd); + + mfd_assert_has_seals(fd, 0); + /* Not adding grow/shrink seals makes the future write + * seal fail to get added + */ + mfd_fail_add_seals(fd, F_SEAL_FUTURE_WRITE); + + mfd_assert_add_seals(fd, F_SEAL_GROW); + mfd_assert_has_seals(fd, F_SEAL_GROW); + + /* Should still fail since shrink seal has + * not yet been added + */ + mfd_fail_add_seals(fd, F_SEAL_FUTURE_WRITE); + + mfd_assert_add_seals(fd, F_SEAL_SHRINK); + mfd_assert_has_seals(fd, F_SEAL_GROW | + F_SEAL_SHRINK); + + /* Now should succeed, also verifies that the seal + * could be added with an existing writable mmap + */ + mfd_assert_add_seals(fd, F_SEAL_FUTURE_WRITE); + mfd_assert_has_seals(fd, F_SEAL_SHRINK | + F_SEAL_GROW | + F_SEAL_FUTURE_WRITE); + + /* read should pass, writes should fail */ + mfd_assert_read(fd); + mfd_fail_write(fd); + + munmap(p, mfd_def_size); + close(fd); + + /* Test adding all seals (grow, shrink, future write) at once */ + fd = mfd_assert_new("kern_memfd_seal_future_write2", + mfd_def_size, + MFD_CLOEXEC | MFD_ALLOW_SEALING); + + p = mfd_assert_mmap_shared(fd); + + mfd_assert_has_seals(fd, 0); + mfd_assert_add_seals(fd, F_SEAL_SHRINK | + F_SEAL_GROW | + F_SEAL_FUTURE_WRITE); + mfd_assert_has_seals(fd, F_SEAL_SHRINK | + F_SEAL_GROW | + F_SEAL_FUTURE_WRITE); + + /* read should pass, writes should fail */ + mfd_assert_read(fd); + mfd_fail_write(fd); + + munmap(p, mfd_def_size); + close(fd); +} + /* * Test SEAL_SHRINK * Test whether SEAL_SHRINK actually prevents shrinking @@ -945,6 +1018,7 @@ int main(int argc, char **argv) test_basic(); test_seal_write(); + test_seal_future_write(); test_seal_shrink(); test_seal_grow(); test_seal_resize();