From patchwork Tue Oct 9 22:20:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 10633325 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 CA03F3CF1 for ; Tue, 9 Oct 2018 22:21:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B9A3B29B2B for ; Tue, 9 Oct 2018 22:21:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ACEA0299FD; Tue, 9 Oct 2018 22:21:08 +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 D541229B1C for ; Tue, 9 Oct 2018 22:21:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7661F6B026B; Tue, 9 Oct 2018 18:21:06 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 715CF6B026C; Tue, 9 Oct 2018 18:21:06 -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 5B8036B026D; Tue, 9 Oct 2018 18:21:06 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by kanga.kvack.org (Postfix) with ESMTP id 16C406B026B for ; Tue, 9 Oct 2018 18:21:06 -0400 (EDT) Received: by mail-pg1-f197.google.com with SMTP id 84-v6so2435040pgc.13 for ; Tue, 09 Oct 2018 15:21:06 -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:mime-version:content-transfer-encoding; bh=zE/nAc/JVnWc4CMHOs76nC5pBisapw03s96G8eS2xeQ=; b=NY2++0TaEqeYp2PW2IhmWpIWBWLfD2Yqnakf5pDURZt8ZetfeKvoT+9ePnPuV4JISi TTtDjCkNTjBZOilzc07lXm8Ob0jtxcG9ylyFaF34/oEIDyKbYc1K4l0/SPtZxv3fGg3R GOMPmDiAO4HZpLJzkN6lSWHwwcZfIgKmMAIUMCrQMZrR33ZIg4ijegTrXSRvscOOj3CE TCU/oWa9fYC5rroa/wfZJj+DTTsMekCfxuX00yE8C8QNj/6gZVZ5YWnZsjIGLRra5Szi QVDjxG+zmUDhwefFHemg4GNZMX0xmWXH/J6d/sSGY6aYt8KAGO8YJFjkANLt0ZorHufS UCCw== X-Gm-Message-State: ABuFfogKbBAoyWlMSNrXpIecFwTGgZC4FFinjFmotAWQxWpnM/4VGl8v YunfMP/ubWSOE9e7kxWXeeil/vvLJOkjZu0snYMfWCBNOK2WhvDLorV9iMsbsBt16od453cskv5 qu+AIIlvwBSCHaLjK7X2G9dgzHLhOT3y33fSvFkJmiLiG3rmjDLfYb31V1qWidMSOSv7Bybt7Xl fy/RHa6ydzbYLUqQijQ/W4RQbx55M7OqzJE9lGA3Rpve2tnCCmrrDLD29YLTJPZV0Tn1pZh5XNZ ABkQp1uKM4oN2trE5vEIogQEALndY7k2/QVUf8ONaAqtnvrXADdpiVCDTf/H6ZlMeEMJsLzhWxH YBSqA0+OMHucwAjsFxv5z5lg8QInmICEGnbwhnmfcQOu7dA0BsxpPtN0Xxm02X0N6M7NBG3PsCP 3 X-Received: by 2002:a63:f5a:: with SMTP id 26-v6mr27242591pgp.100.1539123665711; Tue, 09 Oct 2018 15:21:05 -0700 (PDT) X-Received: by 2002:a63:f5a:: with SMTP id 26-v6mr27242558pgp.100.1539123664793; Tue, 09 Oct 2018 15:21:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539123664; cv=none; d=google.com; s=arc-20160816; b=Hv+vvfXvQHWNvYp9tAT2KbQFHbs2FgBKbpRFsxX1iYLjOp+UJcDJj/NuTKvBOO+970 8/b7v5peezwaGQRa5/LXLVFvozVg3LHWweHk54Y/UelKKE6da/JRcPSEKylp/2bjadFS ta2EB6f6coxT6Osj9C3KSQdrDyqV6NWUGVIuCKWSVGVttwVQP1KjCWOV7F5b/rWBdDpJ 7sG2AxDgzn5RM1do0vvr9E3gdVzeblptZ7XPAnZrOo7g/bKxU5tRDN+Udyn2pz7lYor7 6KzrG0XFmEiWnJYpMGrtiX10jcTCupTVzYaVk4a1Y9NGsw1sH4DJ2AxaJLoVk34kRiFu 2N9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=zE/nAc/JVnWc4CMHOs76nC5pBisapw03s96G8eS2xeQ=; b=aE62NYKOYA+76TmVZcWKddBwtFsqm+7BAltI4DhvbQGt31RA+ooc6k+XxO7PCOoxJE ddByEiEnH/SwbG+xp7o/ugGtPO+GsYOFnOa95Hijb2qNgkUIgCTjHP6XeiohudLr9X// kVixrmh7qRHNHLYM0G4RyZ3xvHUR8OTW9fUHUfwJoFJW54MankF3m+dmxpDidUl9dkI/ PFlubMutrd+G4iVZx66Blt3uz1LTIwHGKndxeTzPtv4JhE71aulyhR92FU+Tq44nqk0O fygtvmSBfDk95ewhohoNhjN00v6uWEk76UFnUUfpjZ7bwY/O7PbGrfuCyMnHJb9YGEzN OgLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@joelfernandes.org header.s=google header.b=DqgZgnQz; 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 o82-v6sor19267846pfj.16.2018.10.09.15.21.04 for (Google Transport Security); Tue, 09 Oct 2018 15:21:04 -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=DqgZgnQz; 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:mime-version :content-transfer-encoding; bh=zE/nAc/JVnWc4CMHOs76nC5pBisapw03s96G8eS2xeQ=; b=DqgZgnQzBHyIneOhD1h4aX7Xyu4gvvYOv+Vk54QCfHuLo0vCFlRbhsT9KfXoGwGe20 pD0AS4uwoDw40u3H6LbfVxJ9WcCPTcJck4wiCPzTNxQ8eyB/POuCYpno94TiBdgJ6cuq N2SId8NAkSqk3T7Td+BFsEbrFN7Q8PFvGvKdk= X-Google-Smtp-Source: ACcGV61RXAN2jDLnDPfW2F40XM1mwAwHFEHxP3Mu2de0YVywOd11qePJX02C+LZ4ZjNTcmH4lZpKdQ== X-Received: by 2002:a62:8891:: with SMTP id l139-v6mr31867512pfd.198.1539123663946; Tue, 09 Oct 2018 15:21:03 -0700 (PDT) Received: from joelaf.mtv.corp.google.com ([2620:0:1000:1601:3aef:314f:b9ea:889f]) by smtp.gmail.com with ESMTPSA id z15-v6sm26900856pfn.170.2018.10.09.15.21.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Oct 2018 15:21:02 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: kernel-team@android.com, "Joel Fernandes (Google)" , jreck@google.com, john.stultz@linaro.org, tkjos@google.com, gregkh@linuxfoundation.org, Andrew Morton , dancol@google.com, "J. Bruce Fields" , Jeff Layton , Khalid Aziz , linux-fsdevel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Mike Kravetz , minchan@google.com, Shuah Khan Subject: [PATCH v2 1/2] mm: Add an F_SEAL_FS_WRITE seal to memfd Date: Tue, 9 Oct 2018 15:20:41 -0700 Message-Id: <20181009222042.9781-1-joel@joelfernandes.org> X-Mailer: git-send-email 2.19.0.605.g01d371f741-goog 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 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 drop its protection for "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 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_FS_WRITE seal which prevents any future mmap and write syscalls from succeeding while keeping the existing mmap active. The following program shows the seal working in action: int main() { int ret, fd; void *addr, *addr2, *addr3, *addr1; ret = memfd_create_region("test_region", REGION_SIZE); printf("ret=%d\n", ret); fd = ret; // Create map addr = mmap(0, REGION_SIZE, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0); if (addr == MAP_FAILED) printf("map 0 failed\n"); else printf("map 0 passed\n"); if ((ret = write(fd, "test", 4)) != 4) printf("write failed even though no fs-write seal " "(ret=%d errno =%d)\n", ret, errno); else printf("write passed\n"); addr1 = mmap(0, REGION_SIZE, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0); if (addr1 == MAP_FAILED) perror("map 1 prot-write failed even though no seal\n"); else printf("map 1 prot-write passed as expected\n"); ret = fcntl(fd, F_ADD_SEALS, F_SEAL_FS_WRITE); if (ret == -1) printf("fcntl failed, errno: %d\n", errno); else printf("fs-write seal now active\n"); if ((ret = write(fd, "test", 4)) != 4) printf("write failed as expected due to fs-write seal\n"); else printf("write passed (unexpected)\n"); addr2 = mmap(0, REGION_SIZE, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0); if (addr2 == MAP_FAILED) perror("map 2 prot-write failed as expected due to seal\n"); else printf("map 2 passed\n"); addr3 = mmap(0, REGION_SIZE, PROT_READ, MAP_SHARED, fd, 0); if (addr3 == MAP_FAILED) perror("map 3 failed\n"); else printf("map 3 prot-read passed as expected\n"); } The output of running this program is as follows: ret=3 map 0 passed write passed map 1 prot-write passed as expected fs-write seal now active write failed as expected due to fs-write seal map 2 prot-write failed as expected due to seal : Permission denied map 3 prot-read passed as expected Note: This seal will also prevent growing and shrinking of the memfd. This is not something we do in Android so it does not affect us, however I have mentioned this behavior of the seal in the manpage. Cc: jreck@google.com Cc: john.stultz@linaro.org Cc: tkjos@google.com Cc: gregkh@linuxfoundation.org Signed-off-by: Joel Fernandes (Google) Reviewed-by: John Stultz --- v1->v2: No change, just added selftests to the series. manpages are ready and I'll submit them once the patches are accepted. include/uapi/linux/fcntl.h | 1 + mm/memfd.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/fcntl.h b/include/uapi/linux/fcntl.h index c98312fa78a5..fe44a2035edf 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_FS_WRITE 0x0010 /* prevent all write-related syscalls */ /* (1U << 31) is reserved for signed error codes */ /* diff --git a/mm/memfd.c b/mm/memfd.c index 27069518e3c5..9b8855b80de9 100644 --- a/mm/memfd.c +++ b/mm/memfd.c @@ -150,7 +150,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_FS_WRITE) static int memfd_add_seals(struct file *file, unsigned int seals) { @@ -219,6 +220,9 @@ static int memfd_add_seals(struct file *file, unsigned int seals) } } + if ((seals & F_SEAL_FS_WRITE) && !(*file_seals & F_SEAL_FS_WRITE)) + file->f_mode &= ~(FMODE_WRITE | FMODE_PWRITE); + *file_seals |= seals; error = 0;