Message ID | 20171023214058.128121-25-ebiggers3@gmail.com |
---|---|
State | RFC |
Delegated to: | Richard Weinberger |
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="iC30hJKe"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="xRgyTAm5"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lufl455k"; 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 3yLWn13Kscz9sP1 for <incoming@patchwork.ozlabs.org>; Tue, 24 Oct 2017 09:49:41 +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=e3bqBYpewOor5DgNKdVf9NuezaNGjXNRtLHp4LndBVw=; b=iC30hJKelI67eeoYyN27+4GHqD q6MMa7CKjoXXnNH6Rvas2V0Z+/xV/GURKtdsSDv4hiah0cYoNXFMuG/G9Tfakhrk0c/q0M2aEmuE4 d4D0lkUIQOX+gWmN4J2tYl/6xftvUBN94t6qW7k21vtyPEBWQfa4BGP8YE4xzzX47hWcKSCdh1HlI B4WkjryHLRT6X8nTx34R9fCr06C+MskS13CrlB+SGxl38ULYtuEsX3pVvSj5kSBifUk4KcEPXGnLA Og+WFFrr0myomCa9wNlGR5FFcxbTIK/pXqAtgCk/x/1kvVM8mZj4vM/1ydRGNGsU5SWbuwTIhQlVn WsjShh6Q==; 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 1e6lX1-0004vn-7j; Mon, 23 Oct 2017 22:49:15 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e6lWy-0004up-VZ for linux-mtd@bombadil.infradead.org; Mon, 23 Oct 2017 22:49:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=JTvI73Oj3Dl4mvmZRRODzNdflOYA5Ch8R//atESWGDc=; b=xRgyTAm53zLYgxwYN8MSIh7WJ VEcb4ZlHunGDC7o2ks16fPLvBqPPmSz7X1p4SDIgxd3+KjpO7l1shpbqDwC2cK5qyAo/JymYFsjvb kfEEaokoGONm8Jarjg/Ypir3D7P/Dspm404oByNdcE33OFDcpt82dQGzBjNLbsWAYNT72YD8VZEcg CKVhtQE3MX+0sNEl4rVJLuZjGNljTYQca51vDSdsp4dYjgSfYd+b/2E1fsp870+rbS3j/eJ0KzTEs s1DeB+UV0cZo+CyHn/iFuNOFdmaaHBov1rd8Vzzj3UNyJg/1c/baOZLcTbXT854OmRPhwWfISXKJM hH4au/zzw==; Received: from mail-io0-x241.google.com ([2607:f8b0:4001:c06::241]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e6kUz-0004Wx-SA for linux-mtd@lists.infradead.org; Mon, 23 Oct 2017 21:43:06 +0000 Received: by mail-io0-x241.google.com with SMTP id m81so21686657ioi.13 for <linux-mtd@lists.infradead.org>; Mon, 23 Oct 2017 14:42:43 -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=JTvI73Oj3Dl4mvmZRRODzNdflOYA5Ch8R//atESWGDc=; b=lufl455kDTyzCtOLPyb4YHNopkfC/myBB5XPQwvenbfCRaK162lbyebysjlLAzfq0v wnrWP8FFOzt+t9dpjRVLqqtn9W1zCZY44cDZwkvNmh5R8mHXmPIyf9u8W6v9p1V0hmwQ eKyDE+ioUzeOEeHBengCVzvsNYsSScTfPcQvxM1lTNQCpgpDqcRjoUsHwV4Nb0GC4G/Q gVD890OziSY+W96hPwM6FxucoDf6aJUa1eoMmiQI+ZXsYsqXvRD4tGW8WjZIo6n2ZxTM cGy+qAjA7RNl44U0di4Z3yRtyfWvO1jkWfrd0wac5mcetmJcYaDOymW0v+CobyQGqMK3 q2fA== 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=JTvI73Oj3Dl4mvmZRRODzNdflOYA5Ch8R//atESWGDc=; b=ErEf3H/6EUMFT/P9SyBEIgS01qPc0bjbUNdh9i5dGpYtROrFdHPBQNvJk6/qUCD5Tv HzOF8soqJizf9mNnjozkJaPjg9bdHIdDM1o4FcFL4n31C5BJeYUbD+qpjCmO5t2tP4ug wz2AD4nNkQKe67Fi7agUZraxJYN4KF6AS9j5cN7kLB0oOA+XABfDyqz2wHZ3mZME+a+b 5r5c5u99LfYiCO/W8R6Ij8SRiwaUGlmUgQLxQSYLy3ln9GNpM9QxxctgNMEwxS5TDv44 XA8pUDdH4ND1Lix1ViRFWlLyPPA/nH+onjZUO3lw5cdAdO7Hit2ZlKxoPktw4yI7Knuj k27w== X-Gm-Message-State: AMCzsaWJkZKTnc2ECIvgx5a09C8iynvPpl16oHyj7ItO6DivavQOCDNH c1n/3Q+yA/359A+pl6NLdi2lKdUr X-Google-Smtp-Source: ABhQp+ScReiKSbXswNsep7vpcXMH2OsyA/pz5ActX2y6vakq4hkK11jTeQTIlDjGsbMneLjoLf4tRA== X-Received: by 10.107.146.134 with SMTP id u128mr18327542iod.209.1508794961361; Mon, 23 Oct 2017 14:42:41 -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.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Oct 2017 14:42:40 -0700 (PDT) From: Eric Biggers <ebiggers3@gmail.com> To: linux-fscrypt@vger.kernel.org Subject: [RFC PATCH 24/25] ubifs crypto: wire up FS_IOC_GET_ENCRYPTION_POLICY_EX Date: Mon, 23 Oct 2017 14:40:57 -0700 Message-Id: <20171023214058.128121-25-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-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.8 (-) X-Spam-Report: SpamAssassin version 3.4.1 on merlin.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:241 listed in] [list.dnswl.org] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (ebiggers3[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 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_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -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/ubifs/ioctl.c b/fs/ubifs/ioctl.c index 09ede2d1898f..2064c01ac864 100644 --- a/fs/ubifs/ioctl.c +++ b/fs/ubifs/ioctl.c @@ -197,13 +197,12 @@ long ubifs_ioctl(struct file *file, unsigned int cmd, unsigned long arg) return -EOPNOTSUPP; #endif } - case FS_IOC_GET_ENCRYPTION_POLICY: { -#ifdef CONFIG_UBIFS_FS_ENCRYPTION + + case FS_IOC_GET_ENCRYPTION_POLICY: return fscrypt_ioctl_get_policy(file, (void __user *)arg); -#else - return -EOPNOTSUPP; -#endif - } + + case FS_IOC_GET_ENCRYPTION_POLICY_EX: + return fscrypt_ioctl_get_policy_ex(file, (void __user *)arg); case FS_IOC_ADD_ENCRYPTION_KEY: return fscrypt_ioctl_add_key(file, (void __user *)arg); @@ -231,6 +230,7 @@ long ubifs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) break; case FS_IOC_SET_ENCRYPTION_POLICY: case FS_IOC_GET_ENCRYPTION_POLICY: + case FS_IOC_GET_ENCRYPTION_POLICY_EX: case FS_IOC_ADD_ENCRYPTION_KEY: case FS_IOC_REMOVE_ENCRYPTION_KEY: case FS_IOC_GET_ENCRYPTION_KEY_STATUS: