From patchwork Thu Nov 8 04:15:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 10673445 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 E00DE14E2 for ; Thu, 8 Nov 2018 04:16:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D17EA2BCB6 for ; Thu, 8 Nov 2018 04:16:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C560B2D6AA; Thu, 8 Nov 2018 04:16:26 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E4A42BCB6 for ; Thu, 8 Nov 2018 04:16:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728853AbeKHNtu (ORCPT ); Thu, 8 Nov 2018 08:49:50 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:33487 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728850AbeKHNtt (ORCPT ); Thu, 8 Nov 2018 08:49:49 -0500 Received: by mail-pg1-f193.google.com with SMTP id q5-v6so8295733pgv.0 for ; Wed, 07 Nov 2018 20:16:17 -0800 (PST) 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=zofjVTOVPvsbdL80JX/HP6LiIlhioMiBlF9iJC67X1A=; b=SBQ5ErAQVg154oxgo1IKPG2CWLZdTmwK1NvBAE1iUbjJ4TcXTgKcnYo0eH1FraaYQT SgH2C35H57byF8/qsMv8oRQZpblfP6AT2pKA0f8uggC/86Y5OLcRHkV+SdBkmpUSu7QA dNo43cyRfnBQXyuLLmT5g20Gfvs7U5tV8FZuc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zofjVTOVPvsbdL80JX/HP6LiIlhioMiBlF9iJC67X1A=; b=b/UrY23WaeAREriaIhv1uLt6yBZ3EbjPjxJHgQ0sF7Wie7lnQEIFNBctgf91dJUKQQ SBuaGk6/2sCd77LSo0dw3FjdZUFu+wKW3fAcA7Ot4h/gjWfcLNZsQmYG0wPo6xsdpEhp aIwyz6N9/FkP3ARqk1Pe33zovrpnsc7c1wp9ybc2lIFlSL0uxWoYTW3kYBvuveLd3CAC 6fR6CgdmQaUjJkVw9DrhwQrSXXbGaSA2vMOTxVSTwQ4L6vdTRMAKE9vz78ab/alX5TWP LbFEs/J20hcLIlX/rqKrcEJzFD4ePxJNJA1LOKDG2HIT0rHGcdVExsnLVwLcbfIhbNyh bxlQ== X-Gm-Message-State: AGRZ1gLjAKFolSQKoW5pV/S/z/liLkexsPVUVNK813ZLytwKtnFl3CVc I5MLMXg9LPT9ExACTZdOLKun1Q== X-Google-Smtp-Source: AJdET5cE1wbXz2O5YlQdpkJ5g7TcdQPHSjzv+EmXi/h5mbiW6JGajVv8Bw/OvVoEpV4KkgDTiTzX6A== X-Received: by 2002:a63:dc54:: with SMTP id f20mr2640249pgj.410.1541650577205; Wed, 07 Nov 2018 20:16:17 -0800 (PST) Received: from joelaf.mtv.corp.google.com ([2620:0:1000:1601:3aef:314f:b9ea:889f]) by smtp.gmail.com with ESMTPSA id t77-v6sm3161096pfj.79.2018.11.07.20.16.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Nov 2018 20:16:16 -0800 (PST) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , dancol@google.com, minchan@kernel.org, John Stultz , Al Viro , Andrew Morton , gregkh@linuxfoundation.org, hch@infradead.org, "J. Bruce Fields" , Jeff Layton , jreck@google.com, Khalid Aziz , Lei Yang , linux-fsdevel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, =?utf-8?q?Marc-Andr?= =?utf-8?q?=C3=A9_Lureau?= , Mike Kravetz , Shuah Khan , tkjos@google.com, valdis.kletnieks@vt.edu Subject: [PATCH v3 resend 2/2] selftests/memfd: Add tests for F_SEAL_FUTURE_WRITE seal Date: Wed, 7 Nov 2018 20:15:37 -0800 Message-Id: <20181108041537.39694-2-joel@joelfernandes.org> X-Mailer: git-send-email 2.19.1.930.g4563a0d9d0-goog In-Reply-To: <20181108041537.39694-1-joel@joelfernandes.org> References: <20181108041537.39694-1-joel@joelfernandes.org> MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add tests to verify sealing memfds with the F_SEAL_FUTURE_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();