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: 10673441 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 0759D15E9 for ; Thu, 8 Nov 2018 04:16:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EAEB62BCB6 for ; Thu, 8 Nov 2018 04:16:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DEC042D6A3; Thu, 8 Nov 2018 04:16: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=ham 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 BF1912BCB6 for ; Thu, 8 Nov 2018 04:16:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3F5356B058A; Wed, 7 Nov 2018 23:16:19 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 3A5C66B058B; Wed, 7 Nov 2018 23:16:19 -0500 (EST) 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 2BF9D6B058C; Wed, 7 Nov 2018 23:16:19 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by kanga.kvack.org (Postfix) with ESMTP id E15016B058A for ; Wed, 7 Nov 2018 23:16:18 -0500 (EST) Received: by mail-pf1-f198.google.com with SMTP id x5-v6so7393641pfn.22 for ; Wed, 07 Nov 2018 20:16:18 -0800 (PST) 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=zofjVTOVPvsbdL80JX/HP6LiIlhioMiBlF9iJC67X1A=; b=ZV92t83JHZFmyUXJwlUwaByYxhvxA0fUHkN1qnPzMo0oufRM6RwYb3uHlP0Y21jQfv olDVvAjCC5hR6Ps2crMfaBO1KR9o8Nsc2aJ5hfOOTnngB4OFT7UOHgcJIguSA218HcBx 5+f1uidFxJfw4BUrYrz4gOKZTfdjsgBXtfkaMaOITBge1kpYYId3Ufc7e5cvDMaIQa4W SVatisn+wUU8tpGWpJWIDX8yHS6smPPJdELJaZNX/302KNUmpeczRGp6JF85RN94hTLz JWtjr58DO2dq7pJaT08dbyl02ZgzGDMVwf7Cbx0TwPpiRUSwlIs0vLCk8nJhAln0k2H9 HBjg== X-Gm-Message-State: AGRZ1gK8WF5cf1bsum0c0eyxBFStkObzMfOrFqAKoErhUUjlRMtWJXdu Jq5f1nRgpH/dTDJTqNWVtiaHdl/UrOFkO69Lkei00bce9yxKcK0HF88y5yLE7voi6FyHrjsxpls PCY+vniLejLliFpke7MWWKGp4mUoLxuLIUdA0OlV8iH0IBsVmcn/tFwWc21re//4hXAvgNEnHCm kzkkUPvO1JInViGJwps7rx6XxM+UiPSxvTNe4IWy7I25H7Sah8NW8+DJTJ1wWb/QlA+ZT0GGgVp oxjflMLSOkrpskl5OaM+Quz3sWoqGcr265u7w/6g8XW5JLlP9mC48thK0FTn33rgh8BbCWS0m10 1rD2HhRKAO6+BDsVK1DdOLdLTbTe+DDwqaTDsc9TNzEepFu9s8HKUatAnqh3YTfXvYlqw2Z5GR6 g X-Received: by 2002:a62:8208:: with SMTP id w8-v6mr3065031pfd.150.1541650578577; Wed, 07 Nov 2018 20:16:18 -0800 (PST) X-Received: by 2002:a62:8208:: with SMTP id w8-v6mr3065007pfd.150.1541650577788; Wed, 07 Nov 2018 20:16:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541650577; cv=none; d=google.com; s=arc-20160816; b=VbnerFx1ZtDj5nxcjWnCaGDJbKlWf10qAA/l/EBzuyRB3ic6Psz2eoSFxZ1csgytGx k90hgYc6m0xvH34rCAyE0waRCYYQiOdwHDS3Nji/uJId9tRmvlLqvxpeipnknyhA+S2p iQPPbDVTIDAAcK85vhyoBDie9UKFYXvFJoDy8TYMPtqlvmz5XV1njPJOBO1PGIjBlRVq +ppOqbKEuVtxmIfXbGw/ErNThyP1nMyn6nvf48asZ+lmQWOMvHJhBbcf5qNd9NxjyOpW A753alEWuOAqer7WWRH0hhaaKKQOZs5lrdL2LBstYSwLM930BURVKhKM8RghWdwnt8wx rf4Q== 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=zofjVTOVPvsbdL80JX/HP6LiIlhioMiBlF9iJC67X1A=; b=orU/57fof7cIC/RtCty4gaewHBzbolTX62qUaIbr99VGlAW1NdcJEiNlh6z6k30O7l GVTT62z+oWFlUrCAifCAtIs/P7SVZqOsODjfppkaFABFs1hUxwiRn7hkerbLrlMUjFFC 1kFAHWMi/F8KThVzY9pV8lULC/Y100T/zrvqRaS6ERVvHZ3lG/Za5fzWkjySAZHVqJ+k Rshzo+cCI3nZM0BPHKANE7rwsm361asRNB9u+q7sNFYtXqK7m5K3avLJdcYbhGxmioMB A7roAFh9/4ay2NVt8zHBvCQLbPhCyHz4keAdjBI2BSGiJafz99L+6aQjGn7s1GuEm2sw hmsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@joelfernandes.org header.s=google header.b=SBQ5ErAQ; 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 v9-v6sor3198090pgr.13.2018.11.07.20.16.17 for (Google Transport Security); Wed, 07 Nov 2018 20:16:17 -0800 (PST) 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=SBQ5ErAQ; 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=zofjVTOVPvsbdL80JX/HP6LiIlhioMiBlF9iJC67X1A=; b=SBQ5ErAQVg154oxgo1IKPG2CWLZdTmwK1NvBAE1iUbjJ4TcXTgKcnYo0eH1FraaYQT SgH2C35H57byF8/qsMv8oRQZpblfP6AT2pKA0f8uggC/86Y5OLcRHkV+SdBkmpUSu7QA dNo43cyRfnBQXyuLLmT5g20Gfvs7U5tV8FZuc= 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 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_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();