From patchwork Thu Nov 8 04:15:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 10673439 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 C3E3D15E9 for ; Thu, 8 Nov 2018 04:16:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B048C2BCB6 for ; Thu, 8 Nov 2018 04:16:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A04272D6AA; Thu, 8 Nov 2018 04:16:20 +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 054A72BCB6 for ; Thu, 8 Nov 2018 04:16:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 444306B0588; Wed, 7 Nov 2018 23:16:18 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 3F4336B0589; Wed, 7 Nov 2018 23:16:18 -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 2BC236B058A; Wed, 7 Nov 2018 23:16:18 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by kanga.kvack.org (Postfix) with ESMTP id E158A6B0588 for ; Wed, 7 Nov 2018 23:16:17 -0500 (EST) Received: by mail-pg1-f198.google.com with SMTP id o9so15158666pgv.19 for ; Wed, 07 Nov 2018 20:16:17 -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:mime-version:content-transfer-encoding; bh=rejq7LmihrIkw26wPVewmdmud8245PyIvhfHBhBGcY4=; b=dV/qtgHchDpwLjkXJGdP3PIX2S0I10LKSx6eWC4tGt0oB6HeAm5KP4poWODc92FA0U yyfrTmmXZ/xgJytnmChBPzoew41kmZ6B/oVuRdFEjO5IwLEEtxV6/Gy2ph4teKTPn6k9 a4u93ZZEyTI/FyniV3sGjygTjBWDwiH6JEpoArFi1s6T7eavRMzqNSJKz55ofMYV0TwM NCKPyW/xG2CM050o/13Hg7YZO0Ozx4y+TWJJuRussjXY0cffHI4KK9vG19QAx5ORdxl1 oeJHY6ks7T3DvmR1Y/RFEbsHVvlYZ8C09szOTnH7dNoKmW13DdxvODlD+jTpadUUnjVH jU6Q== X-Gm-Message-State: AGRZ1gJRj9MWL2hZnOo50hOt5IgvpPLmZk+BvZrMmOh5EE9vXluvbj1h 6tjg7s8t0Dpc5AwlhiP1GMB3M4epccSOR6utXH0iG9hcpCk4iNeGOH9n3GxE4fS1RdGrUKdqAXo i8gh9ngWuxfsqqYHbjvXxeyyYASd+bzHclAtfCKEN6kZj5Q53nwh+jZLrrb091vrPT8icDZfbrC ZLkQfd1in6NWK+knsoPemodrj57Hj2f+1YpaF00CAPwUyINW6mCCU4x7+Fe0dsnD99zrk44wM4S 0Qv0QHZ2K1F1ECOEbFqLhUweQa+1HLEOTijKLJyARIaWpOtGZTP4woHa1J6Uwp4P94RLZEE7di3 5tigi7RqQMbM1lGAfgTB+rPfNHk90aSE1YSwOdDy/o+TUOx/n78KAbci8RfE65liyDwH6r2zTx4 i X-Received: by 2002:a62:5a47:: with SMTP id o68-v6mr3083273pfb.31.1541650577396; Wed, 07 Nov 2018 20:16:17 -0800 (PST) X-Received: by 2002:a62:5a47:: with SMTP id o68-v6mr3083224pfb.31.1541650576330; Wed, 07 Nov 2018 20:16:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541650576; cv=none; d=google.com; s=arc-20160816; b=VOkz5DZGIfJVVf/kl0GpWI5Eq/pViIKE6sCi95vJdy5/9NvxNqri6iaVESzCdiRTHq 7bGaCpYMckWnWhLih09I479e0s1+VHvOFcPLe72mkZKs6l7c81cWsXCA6/QX3eDydMUO WTrNJNtXG4W2RaNVsrc3RcI7ibf/j49p2OPFMptehWCTlqB0sxfiHti/v9GbvmZffAHL xSefJsE+K0MW0G+iogKdQQ+81MlgD9r13vtH4ebK6X94npK+jJtBrUOWExJUYaWqrYTN 7EhcEcFgU0vORhgPKg8l6J7PJwRf2sBy1hQ1+kK/pfPMCS9OavVPSKDrnrh+0K4BgUIr u0BQ== 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=rejq7LmihrIkw26wPVewmdmud8245PyIvhfHBhBGcY4=; b=tOQdlTHiSH5FzRXhcM7d+gmvDiLqNcgkKvQxGurSx+tNpdclrtq7tcSEk/2gfY73Yr pn+z1J4rXFhhOsgP/D5vAETRSOL1/AqzR/AraIiuNGfLI90aehWD7PGfLTqaYmyz3fi5 zA6den1OKbUmHCL7HWr5zHC4jbni65d/LM8OdzFL/d4Rll2OpIlb+zgU1tIlnb+7MR0E agWD6EgI/V6G3SxkVC+l8B2WClrAlY63733mGBayCjT6hJ9Avg0SOhPxwncbhbamkm8Z C9zCWljgWRz48MgP8p+FUefijf8ulrvd5WXk0JKNUwB7uOoONG+Ez8pEH46XAXK0I+3b vZpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@joelfernandes.org header.s=google header.b="gb/zI8jn"; 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 z6sor3163656pgl.57.2018.11.07.20.16.16 for (Google Transport Security); Wed, 07 Nov 2018 20:16:16 -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="gb/zI8jn"; 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=rejq7LmihrIkw26wPVewmdmud8245PyIvhfHBhBGcY4=; b=gb/zI8jn7yj5GmpysxQwQye6ddW7cDF5cBy0i2sbmP6ZtFhHNPaNk7dX+fmGWKO4QG Nifv0423MABZZ+S9shRolD/bP7YuX8sn36OnH0BknRuSrvNmMQZWGZi5yrFhGbftgHMZ z2wM5VgQWijeOXN3rztBDEinsgcxPS7FGODNw= X-Google-Smtp-Source: AJdET5eo6Bf3gDqsocFs6LKCHJuEeYaz1EhoZoiZl6S2onyXrTrP+guyw86fSa/OS1x9f/3Jw+HlCA== X-Received: by 2002:a63:9e0a:: with SMTP id s10mr2592012pgd.239.1541650575402; Wed, 07 Nov 2018 20:16:15 -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.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Nov 2018 20:16:14 -0800 (PST) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , jreck@google.com, john.stultz@linaro.org, tkjos@google.com, gregkh@linuxfoundation.org, hch@infradead.org, Al Viro , Andrew Morton , dancol@google.com, "J. Bruce Fields" , Jeff Layton , Khalid Aziz , Lei Yang , linux-fsdevel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Mike Kravetz , minchan@kernel.org, Shuah Khan , valdis.kletnieks@vt.edu Subject: [PATCH v3 resend 1/2] mm: Add an F_SEAL_FUTURE_WRITE seal to memfd Date: Wed, 7 Nov 2018 20:15:36 -0800 Message-Id: <20181108041537.39694-1-joel@joelfernandes.org> X-Mailer: git-send-email 2.19.1.930.g4563a0d9d0-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 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. The following program shows the seal working in action: #include #include #include #include #include #include #include #define F_SEAL_FUTURE_WRITE 0x0010 #define REGION_SIZE (5 * 1024 * 1024) int memfd_create_region(const char *name, size_t size) { int ret; int fd = syscall(__NR_memfd_create, name, MFD_ALLOW_SEALING); if (fd < 0) return fd; ret = ftruncate(fd, size); if (ret < 0) { close(fd); return ret; } return fd; } 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 future-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_FUTURE_WRITE | F_SEAL_GROW | F_SEAL_SHRINK); if (ret == -1) printf("fcntl failed, errno: %d\n", errno); else printf("future-write seal now active\n"); if ((ret = write(fd, "test", 4)) != 4) printf("write failed as expected due to future-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 future-write seal now active write failed as expected due to future-write seal map 2 prot-write failed as expected due to seal : Permission denied map 3 prot-read passed as expected Cc: jreck@google.com Cc: john.stultz@linaro.org Cc: tkjos@google.com Cc: gregkh@linuxfoundation.org Cc: hch@infradead.org Reviewed-by: John Stultz Signed-off-by: Joel Fernandes (Google) Reported-by: Jann Horn Signed-off-by: Joel Fernandes (Google) Signed-off-by: Joel Fernandes (Google) Signed-off-by: Joel Fernandes --- v1->v2: No change, just added selftests to the series. manpages are ready and I'll submit them once the patches are accepted. v2->v3: Updated commit message to have more support code (John Stultz) Renamed seal from F_SEAL_FS_WRITE to F_SEAL_FUTURE_WRITE (Christoph Hellwig) Allow for this seal only if grow/shrink seals are also either previous set, or are requested along with this seal. (Christoph Hellwig) Added locking to synchronize access to file->f_mode. (Christoph Hellwig) include/uapi/linux/fcntl.h | 1 + mm/memfd.c | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) 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 2bb5e257080e..5ba9804e9515 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_FUTURE_WRITE) static int memfd_add_seals(struct file *file, unsigned int seals) { @@ -219,6 +220,25 @@ static int memfd_add_seals(struct file *file, unsigned int seals) } } + if ((seals & F_SEAL_FUTURE_WRITE) && + !(*file_seals & F_SEAL_FUTURE_WRITE)) { + /* + * The FUTURE_WRITE seal also prevents growing and shrinking + * so we need them to be already set, or requested now. + */ + int test_seals = (seals | *file_seals) & + (F_SEAL_GROW | F_SEAL_SHRINK); + + if (test_seals != (F_SEAL_GROW | F_SEAL_SHRINK)) { + error = -EINVAL; + goto unlock; + } + + spin_lock(&file->f_lock); + file->f_mode &= ~(FMODE_WRITE | FMODE_PWRITE); + spin_unlock(&file->f_lock); + } + *file_seals |= seals; error = 0; 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();