From patchwork Mon Oct 23 21:40:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 829702 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="a7Et9EBC"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="B6PW5JZt"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="upHOoXMz"; 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 3yLVjG4mshz9sPt for ; Tue, 24 Oct 2017 09:01:22 +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=TGC3Fjfi45/5nMfzfyAcQ8RMgQnjjkZWyTWyc6UUY1s=; b=a7Et9EBCFoWoJ7Xkt3ywXY39xT EayuMtwDhJDgG+fACU5EkXBlpAE2qp67YkKPvWW5AgyOVIeQY8X6FBTewkgfk9UH7Bc4SHfSjYRiL wsZNIsgpvsWJm4asnJgvglydpkzorLKouskoWykgET3Q1ND5q8+UapEkET+pD1aXjmut3R/fVb7dP gC37Z9LLv8H6eALJTj9O0JRoNvBSBq9jc4OUhZDXNeS1YzhWgr4ZtelCV56syZJbab58zu/9Ivs2u Hn8ZOu0T/7FK67pRKm6CIwkUgkIK3DsFNAr3JBVHNOGEGhagtUWY3/buAo8mLg1zcmjuIikGfoXHe whtNVclg==; 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 1e6kmY-00023t-73; Mon, 23 Oct 2017 22:01:14 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e6kmB-0000Bl-Vj for linux-mtd@bombadil.infradead.org; Mon, 23 Oct 2017 22:00:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.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=q4ysmxM1Tc8eT1daOT1MgVemWjX6+/LfBa3mlqqW5UI=; b=B6PW5JZtcZinuBhRat5J5t2ov yYaZRDLt+vR1q3XTsOMfjDplGQ/Wpie00Z47AP6huvY13hZiIG3VfBR8rRbH72HoJHZ7DQ6ffOnu4 sW+aDHIypgXDw/e0GMdIxYCDPjFJN47+g0U5Exh5+6WXXszwSMCId2wziv6iAIoM074r6rCSPD6ep qGQ1E8eVavGBCZ1lIOM5LS7yfgfMlP+aYgtTBy4J7SugZdufN2J807nOK6glSOdYzDkJd/eW7+XFc vAAkZQRRgF7HmSKyAgkN9o1Uas8etvVieWypsCBu4ZpwrEqhcg8qJhBZHXaDzgtsz2Vc+CAbbCk+n LrGnOk0Gw==; Received: from mail-io0-x242.google.com ([2607:f8b0:4001:c06::242]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e6kUu-00076w-5I for linux-mtd@lists.infradead.org; Mon, 23 Oct 2017 21:43:01 +0000 Received: by mail-io0-x242.google.com with SMTP id e89so21712887ioi.11 for ; Mon, 23 Oct 2017 14:42:41 -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=q4ysmxM1Tc8eT1daOT1MgVemWjX6+/LfBa3mlqqW5UI=; b=upHOoXMzBopebaQdaFztRT7emgSQ3m9N/DGoH0rDp15I/217Vjv8l2lc2bIo0r5xM1 F917nKkqT4WktmiC64Z2T/gZC0CTA57BbNFAfrrmcSwFp1RfL01faY+vW7sfLDQrVsIr JVQjLKsCsPDFq9+DpN/9C4xW+6yery4+pW1vg5XxjaN5wYlEAwX3ARiAa42ypVMHFxGC X9SshHuMYLxFWa8eJx0uNfDUwXQoxJ/sRW/REbZFr94jKqTkIAavukU6QjcCEuoY8IaU MSTH5ey8FB+aWXDf/qcuUwGHt3Xw44ZP5vS4ZQjTpAKm71F4NO31XrnDi58Ja9Re9jtX 0uPQ== 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=q4ysmxM1Tc8eT1daOT1MgVemWjX6+/LfBa3mlqqW5UI=; b=SkQmupCsx4X2G2OXPH/TRZOIdxyd1XGF1jp+4dtWsvURb8/AlLxQ3Om79z3TWxJDnj 6OC9N3ho4qsPev0P/XT+jmsc0+jMjjGeHpRowfIoSivXWVbhZdZpMmQE0Te27cUKJKVc NfLr3LkOJKs6Lv2s8oEXZJcRBCZRZ5FRMZtQJr16jEol4PRKMng8viyywU1b35exDEEJ VtTLdA1yPoqtdoPOycl1x4ONOjWqLhg3/68w2xmFbkXCWyYNtybMflHh5P4FvzA+HUvq x64f+MnH8K2u9Fa5im+4Eo8JPAW1tUqAPldpt/QutuVRZRIzGupeplJlyHagDYPWzGOm V8kQ== X-Gm-Message-State: AMCzsaVmFxXp59zcpXT0Y4IMl2FDL8lSFJbwXEKBpXn2+sioQ9ODP0Bx vma4bwR0S7hwhOscPsZF40bG+4vu X-Google-Smtp-Source: ABhQp+RuKIGNC4ir0VKFmsI9dyfMpyICcYq5Bu/hz1SRAzQQT2INFz4DqV4Iy9bJ/aCZbZa7+iJAnQ== X-Received: by 10.107.186.87 with SMTP id k84mr19309825iof.121.1508794960096; Mon, 23 Oct 2017 14:42:40 -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.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Oct 2017 14:42:39 -0700 (PDT) From: Eric Biggers To: linux-fscrypt@vger.kernel.org Subject: [RFC PATCH 23/25] f2fs crypto: wire up FS_IOC_GET_ENCRYPTION_POLICY_EX Date: Mon, 23 Oct 2017 14:40:56 -0700 Message-Id: <20171023214058.128121-24-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_224300_313348_A85EB1FE X-CRM114-Status: GOOD ( 12.10 ) X-Spam-Score: -1.8 (-) X-Spam-Report: SpamAssassin version 3.4.1 on casper.infradead.org summary: Content analysis details: (-1.8 points, 5.0 required) 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_AU Message has a valid DKIM or DK signature from author's domain 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 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 FS_IOC_GET_ENCRYPTION_POLICY_EX allows filesystem encryption users to retrieve the encryption policy for files and directories that use a v2 encryption policy. Unlike the original FS_IOC_GET_ENCRYPTION_POLICY, FS_IOC_GET_ENCRYPTION_POLICY_EX is also extensible to new versions of the policy struct that may be added in the future. Signed-off-by: Eric Biggers --- fs/f2fs/file.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 0296a9594fe7..68b6ba732f25 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -1887,11 +1887,6 @@ static int f2fs_ioc_set_encryption_policy(struct file *filp, unsigned long arg) return fscrypt_ioctl_set_policy(filp, (const void __user *)arg); } -static int f2fs_ioc_get_encryption_policy(struct file *filp, unsigned long arg) -{ - return fscrypt_ioctl_get_policy(filp, (void __user *)arg); -} - static int f2fs_ioc_get_encryption_pwsalt(struct file *filp, unsigned long arg) { struct inode *inode = file_inode(filp); @@ -2647,10 +2642,12 @@ long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) return f2fs_ioc_fitrim(filp, arg); case F2FS_IOC_SET_ENCRYPTION_POLICY: return f2fs_ioc_set_encryption_policy(filp, arg); - case F2FS_IOC_GET_ENCRYPTION_POLICY: - return f2fs_ioc_get_encryption_policy(filp, arg); case F2FS_IOC_GET_ENCRYPTION_PWSALT: return f2fs_ioc_get_encryption_pwsalt(filp, arg); + case F2FS_IOC_GET_ENCRYPTION_POLICY: + return fscrypt_ioctl_get_policy(filp, (void __user *)arg); + case FS_IOC_GET_ENCRYPTION_POLICY_EX: + return fscrypt_ioctl_get_policy_ex(filp, (void __user *)arg); case FS_IOC_ADD_ENCRYPTION_KEY: return fscrypt_ioctl_add_key(filp, (void __user *)arg); case FS_IOC_REMOVE_ENCRYPTION_KEY: @@ -2737,6 +2734,7 @@ 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_GET_ENCRYPTION_POLICY_EX: case FS_IOC_ADD_ENCRYPTION_KEY: case FS_IOC_REMOVE_ENCRYPTION_KEY: case FS_IOC_GET_ENCRYPTION_KEY_STATUS: