From patchwork Sat Jan 12 20:38:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 10761087 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 213636C2 for ; Sat, 12 Jan 2019 20:38:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 159E328FD4 for ; Sat, 12 Jan 2019 20:38:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 09A982903B; Sat, 12 Jan 2019 20:38:45 +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 8013728FD4 for ; Sat, 12 Jan 2019 20:38:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726624AbfALUif (ORCPT ); Sat, 12 Jan 2019 15:38:35 -0500 Received: from mail-qk1-f194.google.com ([209.85.222.194]:43156 "EHLO mail-qk1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726609AbfALUif (ORCPT ); Sat, 12 Jan 2019 15:38:35 -0500 Received: by mail-qk1-f194.google.com with SMTP id z18so8522384qkj.10 for ; Sat, 12 Jan 2019 12:38:33 -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=X59k2XX1UnzlfYoU2KHwT+sySFqpz7PmWxdvLhBDFIE=; b=ruN/Yr6iLpU/LNFmr4FNMG9riPkTRrZHcofPj6AkffmGHzLg9yGAMCyuqktfSalvjd VRygPhSJxT9EpoW1T2JkFtTddrI0H/nzgec4VrfLTtcwjUT/b4L3Tgzypq6BnZc+WxT6 hiXZQDCyvYvpxPkkkgCk02n19Nd0s1Ozqbqw8= 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=X59k2XX1UnzlfYoU2KHwT+sySFqpz7PmWxdvLhBDFIE=; b=uff/SLDHgYr8tiUNtPsX965HZEB1J7cbeJVWvG8WHds0KNZ4moh+GadIFuO9F4eiIV 4AJGnElSMCmwYmInrKJkQgorF5ouCO9B3XJb8h4UVd7KGVw49VA0F2PUTJnKM0BkIUoN Bii+oIFzW8OcdVYjZ9nYE5YNLioXppUHbKM4/fd0wXn7Vv/1o538g4qhIlGx8ZAYRNIs OUBcLH/ugYYTdlfjmEtct/G9xiBkvfTHjy7JHkYo8Sf2GS2NTP3+sxqde1sTSeXXvqO6 c4Bb4XzPDvSCzE3P0p1qH2QbMOyJ1wtcFMDD9ctLfgvrq8YdNE73JPXUk0UeywpTc4lW jWAQ== X-Gm-Message-State: AJcUukdiEEHOa2dRDJT7l3MjYLz6zEipzXTULE+yTB1qbpnsL10Z3y9D QgIV2MJESMbHUZJ3lvCxzCflIA== X-Google-Smtp-Source: ALg8bN4jPXax4laIu1WzosZcAcZeXZ4Wm0QM14TQ9ICZoH3TjNgWJlkhwwFbm54ECOfxBEXe5f2MBw== X-Received: by 2002:a37:9906:: with SMTP id b6mr17565376qke.208.1547325513368; Sat, 12 Jan 2019 12:38:33 -0800 (PST) Received: from joelaf.cam.corp.google.com ([2620:0:1004:1100:cfd0:d2ee:d54d:ab6d]) by smtp.gmail.com with ESMTPSA id c12sm55883402qka.42.2019.01.12.12.38.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Jan 2019 12:38:32 -0800 (PST) From: Joel Fernandes To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , Andy Lutomirski , Al Viro , Andrew Morton , dancol@google.com, Hugh Dickins , Jann Horn , "J. Bruce Fields" , Jeff Layton , John Stultz , linux-api@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Matthew Wilcox , Mike Kravetz , minchan@kernel.org, Shuah Khan Subject: [PATCH v4 1/2] mm/memfd: Add an F_SEAL_FUTURE_WRITE seal to memfd Date: Sat, 12 Jan 2019 15:38:15 -0500 Message-Id: <20190112203816.85534-2-joel@joelfernandes.org> X-Mailer: git-send-email 2.20.1.97.g81188d93c3-goog In-Reply-To: <20190112203816.85534-1-joel@joelfernandes.org> References: <20190112203816.85534-1-joel@joelfernandes.org> MIME-Version: 1.0 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Joel Fernandes (Google)" Android uses ashmem for sharing memory regions. We are looking forward to migrating all usecases of ashmem to memfd so that we can possibly remove the ashmem driver in the future from staging while also benefiting from using memfd and contributing to it. Note staging drivers are also not ABI and generally can be removed at anytime. One of the main usecases Android has is the ability to create a region and mmap it as writeable, then add protection against making any "future" writes while keeping the existing already mmap'ed writeable-region active. This allows us to implement a usecase where receivers of the shared memory buffer can get a read-only view, while the sender continues to write to the buffer. See CursorWindow documentation in Android for more details: https://developer.android.com/reference/android/database/CursorWindow This usecase cannot be implemented with the existing F_SEAL_WRITE seal. To support the usecase, this patch adds a new F_SEAL_FUTURE_WRITE seal which prevents any future mmap and write syscalls from succeeding while keeping the existing mmap active. A better way to do F_SEAL_FUTURE_WRITE seal was discussed [1] last week where we don't need to modify core VFS structures to get the same behavior of the seal. This solves several side-effects pointed by Andy. self-tests are provided in later patch to verify the expected semantics. [1] https://lore.kernel.org/lkml/20181111173650.GA256781@google.com/ [Thanks a lot to Andy for suggestions to improve code] Cc: Andy Lutomirski Signed-off-by: Joel Fernandes (Google) Acked-by: John Stultz --- fs/hugetlbfs/inode.c | 2 +- include/uapi/linux/fcntl.h | 1 + mm/memfd.c | 3 ++- mm/shmem.c | 25 ++++++++++++++++++++++--- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 53ea3cef526e..3daf471bbd92 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -557,7 +557,7 @@ static long hugetlbfs_punch_hole(struct inode *inode, loff_t offset, loff_t len) inode_lock(inode); /* protected by i_mutex */ - if (info->seals & F_SEAL_WRITE) { + if (info->seals & (F_SEAL_WRITE | F_SEAL_FUTURE_WRITE)) { inode_unlock(inode); return -EPERM; } diff --git a/include/uapi/linux/fcntl.h b/include/uapi/linux/fcntl.h index 6448cdd9a350..a2f8658f1c55 100644 --- a/include/uapi/linux/fcntl.h +++ b/include/uapi/linux/fcntl.h @@ -41,6 +41,7 @@ #define F_SEAL_SHRINK 0x0002 /* prevent file from shrinking */ #define F_SEAL_GROW 0x0004 /* prevent file from growing */ #define F_SEAL_WRITE 0x0008 /* prevent writes */ +#define F_SEAL_FUTURE_WRITE 0x0010 /* prevent future writes while mapped */ /* (1U << 31) is reserved for signed error codes */ /* diff --git a/mm/memfd.c b/mm/memfd.c index 97264c79d2cd..650e65a46b9c 100644 --- a/mm/memfd.c +++ b/mm/memfd.c @@ -131,7 +131,8 @@ static unsigned int *memfd_file_seals_ptr(struct file *file) #define F_ALL_SEALS (F_SEAL_SEAL | \ F_SEAL_SHRINK | \ F_SEAL_GROW | \ - F_SEAL_WRITE) + F_SEAL_WRITE | \ + F_SEAL_FUTURE_WRITE) static int memfd_add_seals(struct file *file, unsigned int seals) { diff --git a/mm/shmem.c b/mm/shmem.c index 6ece1e2fe76e..3c98cc9655b4 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2125,6 +2125,24 @@ int shmem_lock(struct file *file, int lock, struct user_struct *user) static int shmem_mmap(struct file *file, struct vm_area_struct *vma) { + struct shmem_inode_info *info = SHMEM_I(file_inode(file)); + + if (info->seals & F_SEAL_FUTURE_WRITE) { + /* + * New PROT_WRITE and MAP_SHARED mmaps are not allowed when + * "future write" seal active. + */ + if ((vma->vm_flags & VM_SHARED) && (vma->vm_flags & VM_WRITE)) + return -EPERM; + + /* + * Since the F_SEAL_FUTURE_WRITE seals allow for a MAP_SHARED + * read-only mapping, take care to not allow mprotect to revert + * protections. + */ + vma->vm_flags &= ~(VM_MAYWRITE); + } + file_accessed(file); vma->vm_ops = &shmem_vm_ops; if (IS_ENABLED(CONFIG_TRANSPARENT_HUGE_PAGECACHE) && @@ -2375,8 +2393,9 @@ shmem_write_begin(struct file *file, struct address_space *mapping, pgoff_t index = pos >> PAGE_SHIFT; /* i_mutex is held by caller */ - if (unlikely(info->seals & (F_SEAL_WRITE | F_SEAL_GROW))) { - if (info->seals & F_SEAL_WRITE) + if (unlikely(info->seals & (F_SEAL_GROW | + F_SEAL_WRITE | F_SEAL_FUTURE_WRITE))) { + if (info->seals & (F_SEAL_WRITE | F_SEAL_FUTURE_WRITE)) return -EPERM; if ((info->seals & F_SEAL_GROW) && pos + len > inode->i_size) return -EPERM; @@ -2639,7 +2658,7 @@ static long shmem_fallocate(struct file *file, int mode, loff_t offset, DECLARE_WAIT_QUEUE_HEAD_ONSTACK(shmem_falloc_waitq); /* protected by i_mutex */ - if (info->seals & F_SEAL_WRITE) { + if (info->seals & (F_SEAL_WRITE | F_SEAL_FUTURE_WRITE)) { error = -EPERM; goto out; } From patchwork Sat Jan 12 20:38:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 10761091 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 66CB81390 for ; Sat, 12 Jan 2019 20:38:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5BDEB28FD4 for ; Sat, 12 Jan 2019 20:38:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4FAC72902F; Sat, 12 Jan 2019 20:38:45 +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 CC18629030 for ; Sat, 12 Jan 2019 20:38:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726663AbfALUim (ORCPT ); Sat, 12 Jan 2019 15:38:42 -0500 Received: from mail-qt1-f196.google.com ([209.85.160.196]:42662 "EHLO mail-qt1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726613AbfALUig (ORCPT ); Sat, 12 Jan 2019 15:38:36 -0500 Received: by mail-qt1-f196.google.com with SMTP id d19so22624642qtq.9 for ; Sat, 12 Jan 2019 12:38:35 -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=0MWo8Mkvt471260EQpjgHwB7ntQEkhWkiuroZZqGz7Q=; b=lmKUV/dUsPcqBbfMgv9BdXHViFVQX4L9qEX5mzBe6yCJ3IgEoApudENEMiWX9PcSia 78dwptQY2hD/6JHzCY7HMGBemp+tgjZhQ05kPp4parsICyeHICoGCaoIMK0aQJFKc8sR h8iqwys+YBCWX9ip/qKIEogwazXSfSq605vN4= 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=0MWo8Mkvt471260EQpjgHwB7ntQEkhWkiuroZZqGz7Q=; b=GNdhpaWv6xPnmoClfAqa1VAR+iFoyAFQiQgUWchJCZhnUFuCpo4/s9zJEtcfT3MdOu x0Em/bNR2LXPk40XRT/+rVGYnKBXnPDS6Fu1WCvXRB4UReMUGoqkcvKga86bvOPYwEBC pdmCsBtLZ9y+bydPPt4O2ovMKJznj+3hiWiTJI5DeOoFtpdKfgwTkZzZ8nAjamw/43u8 165FVvZ3fcwcuX2zURPh/Y4E93YbmxtRt+OY2uK0EkEg6WnnDrPhBPiGKme/SNhm9pjw cpe2QX2mf6pLyH3CY8aYLkxy9l76V3ck1bQWQc05IqrRlY+B2+wgWXxVex3ofz2FqU8U p6eQ== X-Gm-Message-State: AJcUukfoguKGJRP+g8nL3iVLsXFdYc9m7tTwgMewLTAYGnaOVMXR/aL8 oIxykidM5KC3+tSm0Ata5x6kpA== X-Google-Smtp-Source: ALg8bN4EPzx3WrCu4lodXwGRW7peAjqqjPCeB/57bYpl+61/kVhWIFRuqh/Sb/FiGO3i6UC8/M6CjA== X-Received: by 2002:a0c:e751:: with SMTP id g17mr18871160qvn.160.1547325514848; Sat, 12 Jan 2019 12:38:34 -0800 (PST) Received: from joelaf.cam.corp.google.com ([2620:0:1004:1100:cfd0:d2ee:d54d:ab6d]) by smtp.gmail.com with ESMTPSA id c12sm55883402qka.42.2019.01.12.12.38.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Jan 2019 12:38:34 -0800 (PST) From: Joel Fernandes To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , dancol@google.com, minchan@kernel.org, Jann Horn , John Stultz , Al Viro , Andrew Morton , Andy Lutomirski , Hugh Dickins , "J. Bruce Fields" , Jeff Layton , linux-api@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Matthew Wilcox , Mike Kravetz , Shuah Khan Subject: [PATCH v4 2/2] selftests/memfd: Add tests for F_SEAL_FUTURE_WRITE seal Date: Sat, 12 Jan 2019 15:38:16 -0500 Message-Id: <20190112203816.85534-3-joel@joelfernandes.org> X-Mailer: git-send-email 2.20.1.97.g81188d93c3-goog In-Reply-To: <20190112203816.85534-1-joel@joelfernandes.org> References: <20190112203816.85534-1-joel@joelfernandes.org> MIME-Version: 1.0 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Joel Fernandes (Google)" Add tests to verify sealing memfds with the F_SEAL_FUTURE_WRITE works as expected. Cc: dancol@google.com Cc: minchan@kernel.org Cc: Jann Horn Cc: John Stultz Signed-off-by: Joel Fernandes (Google) Reviewed-by: Shuah Khan --- 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..c67d32eeb668 100644 --- a/tools/testing/selftests/memfd/memfd_test.c +++ b/tools/testing/selftests/memfd/memfd_test.c @@ -54,6 +54,22 @@ static int mfd_assert_new(const char *name, loff_t sz, unsigned int flags) return fd; } +static int mfd_assert_reopen_fd(int fd_in) +{ + int r, fd; + char path[100]; + + sprintf(path, "/proc/self/fd/%d", fd_in); + + fd = open(path, O_RDWR); + if (fd < 0) { + printf("re-open of existing fd %d failed\n", fd_in); + abort(); + } + + return fd; +} + static void mfd_fail_new(const char *name, unsigned int flags) { int r; @@ -255,6 +271,25 @@ static void mfd_assert_read(int fd) munmap(p, mfd_def_size); } +/* Test that PROT_READ + MAP_SHARED mappings work. */ +static void mfd_assert_read_shared(int fd) +{ + void *p; + + /* verify PROT_READ and MAP_SHARED *is* allowed */ + p = mmap(NULL, + mfd_def_size, + PROT_READ, + MAP_SHARED, + fd, + 0); + if (p == MAP_FAILED) { + printf("mmap() failed: %m\n"); + abort(); + } + munmap(p, mfd_def_size); +} + static void mfd_assert_write(int fd) { ssize_t l; @@ -692,6 +727,44 @@ 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, fd2; + 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); + + mfd_assert_add_seals(fd, F_SEAL_FUTURE_WRITE); + mfd_assert_has_seals(fd, F_SEAL_FUTURE_WRITE); + + /* read should pass, writes should fail */ + mfd_assert_read(fd); + mfd_assert_read_shared(fd); + mfd_fail_write(fd); + + fd2 = mfd_assert_reopen_fd(fd); + /* read should pass, writes should still fail */ + mfd_assert_read(fd2); + mfd_assert_read_shared(fd2); + mfd_fail_write(fd2); + + munmap(p, mfd_def_size); + close(fd2); + 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();