From patchwork Mon Oct 23 21:40:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 829698 Return-Path: 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=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="W9OjOAn6"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MczdoO+H"; 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 3yLVf72JSsz9s0Z for ; Tue, 24 Oct 2017 08:58:39 +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=ZmTHYAu3NtIL2ZOgJ/lgA8m5P/m9tOASDrqhHULqM8E=; b=W9OjOAn66ezgACUU9flNS4ULQr GVGwMAEZPtmqUwDcSpYssm4uHDuuK6avPSMNEex7YcKE+Vd2+9NV+PRs+BQ/NvVwSf6DryPnfPvPE XkFJDOgZsb4G0ifUchxBKccLWHz8mMoSuoQkEn9Utt9TlPXByNYb/6KetMIiJNUKzh4mEqP5bDadQ +GqWl8E67Eay92X8AemC0cqTkeK2CL/689uxABt/091V6fsksdYaDQ5bZYQQIsho7rRDMvjhWb6MP hE1d9DQWcl0CTg0SwtypfMJg01dlLch6jgH5fWt8BjidvWlHI7P8h2bznTRHpGN4ZtnxMlBFxW9W5 pphIwS7w==; 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 1e6kjx-0006qn-47; Mon, 23 Oct 2017 21:58:33 +0000 Received: from mail-it0-x242.google.com ([2607:f8b0:4001:c0b::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e6kUb-0004gW-9Q for linux-mtd@lists.infradead.org; Mon, 23 Oct 2017 21:42:49 +0000 Received: by mail-it0-x242.google.com with SMTP id o135so7706444itb.0 for ; Mon, 23 Oct 2017 14:42:25 -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=R6C2AaIneOIoXK0xAiQxuXlGvMlgmSYIIzFiV5vgznY=; b=MczdoO+HetE3uCJyjN+DCLsHsvFeX1TzOL3WXkBil7ZkL1m43GHCycyWaUomKXl91t PQ8akUqFyGA7RPRzJd/3+dWC6y8CVNi8qj9UuxNCveB4sN3mxgkKVyHkReUSeAa06+Il w1e0Rkax/1jQxpBHSUYrVgoRuCoowqRk8u7gxDok7+GMwe9YL/sK6dQgY0QI3hy7IqTj OjCLSj3lxblvqbeWasnV4i6Ifh0yKU5/Dk4QRz+qv/N+BzaSTTT5Z3VXwtR4h6+7dsSI TGZTkR0dQ1Z/Dgci9OMZh4cwLhvEiybaYzT3q9fNLuz+s5zK4blALf+9WqJ1sAfgHRny Kk3g== 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=R6C2AaIneOIoXK0xAiQxuXlGvMlgmSYIIzFiV5vgznY=; b=ETXIIL9MlTbuP173hWqfggupGxbIZPdvoOmyJkiQObs84vsZm9BO3GOQOhrx2mXco1 HrKyZlvFvxSxTmL84iDGNs/uo9op6r3a/ISrE23OjNrsmi6lK50xHAamhgHek6kAppcS bd2eKkPEoEhqA51Z5hgnZNxoM1QH4BoLIDCgFXwimUlMULwlwo4FkiSWThDIhJ1IyHYQ aPBDwGVGz9N+CL5sKpr0V+vOC5zJ8KHkCAwfAMtpfYFXSgwbywottDXbPldC9iuuMD0U eescCWFXs8oOGlAuA6M43Wsnq6SBhpvpqk5p4gU5AWnq5clhzVOfLWq4uldrXydPp6fw 7obg== X-Gm-Message-State: AMCzsaVjLxHTWPzpBElsipM+nER06HFM6w91G6H6bii2xxmoG4wkEEzO Ueznu4QS557qt8ASG3YXbIY= X-Google-Smtp-Source: ABhQp+RSUFcy9d6MFUB0UUAg7tIAbr8MIaz9+cjaBCaDvK3Y2v0xXa6vpnRnD/F4RDZ6BQ7bNUNEGQ== X-Received: by 10.36.233.196 with SMTP id f187mr10615019ith.14.1508794945434; Mon, 23 Oct 2017 14:42:25 -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.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Oct 2017 14:42:25 -0700 (PDT) From: Eric Biggers To: linux-fscrypt@vger.kernel.org Subject: [RFC PATCH 12/25] ext4 crypto: wire up new ioctls for managing encryption keys Date: Mon, 23 Oct 2017 14:40:45 -0700 Message-Id: <20171023214058.128121-13-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_144242_296758_2E977022 X-CRM114-Status: UNSURE ( 7.83 ) 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:c0b: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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ryo Hashimoto , Gwendal Grignou , "Theodore Y . Ts'o" , Eric Biggers , linux-api@vger.kernel.org, Nick Desaulniers , linux-f2fs-devel@lists.sourceforge.net, keyrings@vger.kernel.org, linux-mtd@lists.infradead.org, Michael Halcrow , Sarthak Kukreti , linux-fsdevel@vger.kernel.org, Jaegeuk Kim , linux-ext4@vger.kernel.org MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Eric Biggers Signed-off-by: Eric Biggers --- fs/ext4/ioctl.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index afb66d4ab5cf..b8a6765a556f 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c @@ -978,6 +978,21 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) case EXT4_IOC_GET_ENCRYPTION_POLICY: return fscrypt_ioctl_get_policy(filp, (void __user *)arg); + case FS_IOC_ADD_ENCRYPTION_KEY: + if (!ext4_has_feature_encrypt(sb)) + return -EOPNOTSUPP; + return fscrypt_ioctl_add_key(filp, (void __user *)arg); + + case FS_IOC_REMOVE_ENCRYPTION_KEY: + if (!ext4_has_feature_encrypt(sb)) + return -EOPNOTSUPP; + return fscrypt_ioctl_remove_key(filp, (const void __user *)arg); + + case FS_IOC_GET_ENCRYPTION_KEY_STATUS: + if (!ext4_has_feature_encrypt(sb)) + return -EOPNOTSUPP; + return fscrypt_ioctl_get_key_status(filp, (void __user *)arg); + case EXT4_IOC_FSGETXATTR: { struct fsxattr fa; @@ -1102,6 +1117,9 @@ long ext4_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) case EXT4_IOC_SET_ENCRYPTION_POLICY: case EXT4_IOC_GET_ENCRYPTION_PWSALT: case EXT4_IOC_GET_ENCRYPTION_POLICY: + case FS_IOC_ADD_ENCRYPTION_KEY: + case FS_IOC_REMOVE_ENCRYPTION_KEY: + case FS_IOC_GET_ENCRYPTION_KEY_STATUS: case EXT4_IOC_SHUTDOWN: case FS_IOC_GETFSMAP: break;