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: 829653 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MczdoO+H"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yLVHc6DzDz9sRg for ; Tue, 24 Oct 2017 08:42:36 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932201AbdJWVmf (ORCPT ); Mon, 23 Oct 2017 17:42:35 -0400 Received: from mail-it0-f67.google.com ([209.85.214.67]:56831 "EHLO mail-it0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932173AbdJWVm0 (ORCPT ); Mon, 23 Oct 2017 17:42:26 -0400 Received: by mail-it0-f67.google.com with SMTP id r127so7684788itb.5; Mon, 23 Oct 2017 14:42:26 -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=De6udkpArkJ2/dQ+8JQ2whGTmO1+wsHzDF7i9UmR/u5/jUwKaWUFfIw6Jrna8AOOSx X94ADg2x53ZZj4IYqT11qEvmJZVGo4RsmLIHV87R2pvC5Q5C9ZMCRskrFpJEe2ZeeuRI kshAyzab7JEDjHo7hmb9r4XpY74iBxG+PBuLhVR/0XqpAaBSj8OXlNozt0sCZde0+6rR lfBzU560kVKu7ozdqzb1P8jaPabQ+fvBxnbkbHe3A1xHrG3S7pUM0gKnzboP/cGifMxd WamXyg04jMFvtoEuVhGIzKUjfVUg/d9BzoDDmcqdFfsWlbCzeyhu+XWHYw6lXKrYix9Q taKQ== X-Gm-Message-State: AMCzsaWTVgj1jYJgbQlJU3tf0MMmG+zpNIWDv1DM0DP8Y+0i9exd3uQi vKZTLx/4HDRGzSYwZ9nHxUS1aQkL 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 Cc: linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-mtd@lists.infradead.org, linux-api@vger.kernel.org, keyrings@vger.kernel.org, "Theodore Y . Ts'o" , Jaegeuk Kim , Gwendal Grignou , Ryo Hashimoto , Sarthak Kukreti , Nick Desaulniers , Michael Halcrow , Eric Biggers 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> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.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;