Message ID | 20171023214058.128121-14-ebiggers3@gmail.com |
---|---|
State | Not Applicable |
Headers | show
Return-Path: <linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="pJNGZCq8"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gWqezrSC"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yLVMT3sGTz9sPt for <incoming@patchwork.ozlabs.org>; Tue, 24 Oct 2017 08:45:57 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=PUV1aHLXX1ZtcSYcFjdl1DeRnPF0+SHgfvDirWgYudQ=; b=pJNGZCq8meEE1UXalR1pJZXh9e WaQJyiG9fZI0GkqpI8vPmimFb0Wj7myZ6ROSbKvUw0d/gXBnA+gLEoDoKcDf/GbEwmF/OQlkPRDa9 MbMySJ1/0huD8iHaQirm5tiisnErxefgoQ/U3OQKuw9aaRfktrquo+RJh1/rnSLE141MeqIfJtKls Ot9/8JO1zEW6Ugsi160TltDtonukYqgc7G8UnBwHj1bh2bz+TCSRaSGTboAIYGXu5gTHKwqYNLi8y izFlNvBrZTSvacdxU1Oh6ipUYiA9gDRZwRXk4tELZ7eMN7uef/CiK2z1erfD56+dhf7cW7YeJkvEC 4oJeFLDw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e6kXc-0008WL-Gt; Mon, 23 Oct 2017 21:45:48 +0000 Received: from mail-io0-x242.google.com ([2607:f8b0:4001:c06::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e6kUg-0004ge-Gt for linux-mtd@lists.infradead.org; Mon, 23 Oct 2017 21:42:55 +0000 Received: by mail-io0-x242.google.com with SMTP id p186so21681217ioe.12 for <linux-mtd@lists.infradead.org>; Mon, 23 Oct 2017 14:42:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jAhGMqQsViLdQ28Cp4m3d4i0dN1WL0MwsTETCvPIBwA=; b=gWqezrSCxDld13xUz5iB2icbznkayxMKXBPaNFNGz3aZAln6Dj6L0WVWesoVJ5gcJ+ ky4ctyzenvlSCM7k0TiyNbdmI++d+l3BPnCcNVtZunlu4UdVbuEuHPOXIHG+FaQzxYx7 MN2qFHwj+uoi2MGDSmqponQpWJs42LVb/DnwT4y/BN1vmY2hUr/XK7JdavfsO/srs4s0 NhHaPMlH7ovEJibVnM3MA2P+ARiLakODremgrjk5vxj7j11IgaSDOE5OB5Q4lD4oLNLe Q6aCjfVyD3uLtfpMxEAK/lcT1W3vZkRVdqPAHBLrovGRNAWV/Q4IBf+sPwLa0T7KoWJW jvuA== 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; bh=jAhGMqQsViLdQ28Cp4m3d4i0dN1WL0MwsTETCvPIBwA=; b=ffYtGsZE6Amh70LujFHzR56gsEOiVL+O74cqlWAK/V2YSoE+Hqg4RI+0sdoJtlvLRG YsGZOTr4PPhqkFWuwIGnzpCwGe0cI9v7shJxSPz35eqPkn79T7QGwH5wlo5L/4uWtzA9 bdpPAL5+u9E+TOS6r+MGvkuAa2DibmQlbwRGCEZRs21Gl6SvKT1LRWob+gcwTjnqH/oG qqk33GpaXRPzujoLYQ/rAaVcBoh9NlbyyA+bSJmMOUbKJbGy3gvf4kB+5qKh3jfttk/N b4UoZT3LzCOP2mQJLrAmJ4mlSbTCEFjlxWFHoAh8Wgr4hNJE6uONmYrB0DzHYmdmvFqB gf3Q== X-Gm-Message-State: AMCzsaX/Qm2+Rsaf41kJBJA8yg2CjE++WEwvXzg+zeersweRH4e5ilno hglYS/mjOCyIBjnJmD9VkfI= X-Google-Smtp-Source: ABhQp+TC6a5lFG+uMjQBPXOwSNra3BElECyumBqazBHOEhaudVt6HRr/Jo5GenPtAyKladPibxwy3A== X-Received: by 10.107.186.87 with SMTP id k84mr19309249iof.121.1508794946719; Mon, 23 Oct 2017 14:42:26 -0700 (PDT) Received: from ebiggers-linuxstation.kir.corp.google.com ([100.66.175.88]) by smtp.gmail.com with ESMTPSA id i63sm3558482ioi.68.2017.10.23.14.42.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Oct 2017 14:42:26 -0700 (PDT) From: Eric Biggers <ebiggers3@gmail.com> To: linux-fscrypt@vger.kernel.org Subject: [RFC PATCH 13/25] f2fs crypto: wire up new ioctls for managing encryption keys Date: Mon, 23 Oct 2017 14:40:46 -0700 Message-Id: <20171023214058.128121-14-ebiggers3@gmail.com> X-Mailer: git-send-email 2.15.0.rc0.271.g36b669edcc-goog In-Reply-To: <20171023214058.128121-1-ebiggers3@gmail.com> References: <20171023214058.128121-1-ebiggers3@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171023_144247_108970_676FCACC X-CRM114-Status: UNSURE ( 7.54 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.8 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:4001:c06:0:0:0:242 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (ebiggers3[at]gmail.com) 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (ebiggers3[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list <linux-mtd.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-mtd>, <mailto:linux-mtd-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-mtd/> List-Post: <mailto:linux-mtd@lists.infradead.org> List-Help: <mailto:linux-mtd-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-mtd>, <mailto:linux-mtd-request@lists.infradead.org?subject=subscribe> Cc: Ryo Hashimoto <hashimoto@chromium.org>, Gwendal Grignou <gwendal@chromium.org>, "Theodore Y . Ts'o" <tytso@mit.edu>, Eric Biggers <ebiggers@google.com>, linux-api@vger.kernel.org, Nick Desaulniers <ndesaulniers@google.com>, linux-f2fs-devel@lists.sourceforge.net, keyrings@vger.kernel.org, linux-mtd@lists.infradead.org, Michael Halcrow <mhalcrow@google.com>, Sarthak Kukreti <sarthakkukreti@chromium.org>, linux-fsdevel@vger.kernel.org, Jaegeuk Kim <jaegeuk@kernel.org>, linux-ext4@vger.kernel.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-mtd" <linux-mtd-bounces@lists.infradead.org> Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org |
Series |
fscrypt: filesystem-level keyring and v2 policy support
|
expand
|
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 517e112c8a9a..0296a9594fe7 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -2651,6 +2651,12 @@ long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) return f2fs_ioc_get_encryption_policy(filp, arg); case F2FS_IOC_GET_ENCRYPTION_PWSALT: return f2fs_ioc_get_encryption_pwsalt(filp, arg); + case FS_IOC_ADD_ENCRYPTION_KEY: + return fscrypt_ioctl_add_key(filp, (void __user *)arg); + case FS_IOC_REMOVE_ENCRYPTION_KEY: + return fscrypt_ioctl_remove_key(filp, (const void __user *)arg); + case FS_IOC_GET_ENCRYPTION_KEY_STATUS: + return fscrypt_ioctl_get_key_status(filp, (void __user *)arg); case F2FS_IOC_GARBAGE_COLLECT: return f2fs_ioc_gc(filp, arg); case F2FS_IOC_GARBAGE_COLLECT_RANGE: @@ -2731,6 +2737,9 @@ long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) case F2FS_IOC_SET_ENCRYPTION_POLICY: case F2FS_IOC_GET_ENCRYPTION_PWSALT: case F2FS_IOC_GET_ENCRYPTION_POLICY: + case FS_IOC_ADD_ENCRYPTION_KEY: + case FS_IOC_REMOVE_ENCRYPTION_KEY: + case FS_IOC_GET_ENCRYPTION_KEY_STATUS: case F2FS_IOC_GARBAGE_COLLECT: case F2FS_IOC_GARBAGE_COLLECT_RANGE: case F2FS_IOC_WRITE_CHECKPOINT: