From patchwork Fri Apr 7 17:58:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 9670063 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E41FF6021C for ; Fri, 7 Apr 2017 18:01:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD2412860E for ; Fri, 7 Apr 2017 18:01:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D20BB2862A; Fri, 7 Apr 2017 18:01:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5EF922860E for ; Fri, 7 Apr 2017 18:01:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934662AbdDGSBE (ORCPT ); Fri, 7 Apr 2017 14:01:04 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:35260 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932127AbdDGSBC (ORCPT ); Fri, 7 Apr 2017 14:01:02 -0400 Received: by mail-pg0-f67.google.com with SMTP id g2so16991645pge.2; Fri, 07 Apr 2017 11:01:02 -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=5v8VKJN9Zq704onJwTcCXuAlhTE9rA2w/w0rT4pBALw=; b=EOegSs4M3bA17RHwOwYD+nC4xaylTMcI2fWbHM6rUVlYyrSlA8gN/Rsp1hZvHto5yQ c9vF5pKsAf1HfHYiNbYlTlR8wecxX06TLl+8utdQLQuz+kKCVfdrQGnYVaq9SJZkm5zr yE9oEFCkSQF6c2qFT+RAemP0HJFA0uOjfVSOs85pN29SFGJREym7m4tfLwMNl1MWWQTt MBj8heHj/tqrO6XwBIcL5HmVxs4fwHtKkPTq3MvsjT3oZ9wgHf0FxhXPRSCGWY7BYKrn ecZn+nMHPX7gXLUSy8nQV8bOYsMGLkDdBLnegl02X0d/Em9spjfEBlrqWJzItZtpr4e9 IaUQ== 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=5v8VKJN9Zq704onJwTcCXuAlhTE9rA2w/w0rT4pBALw=; b=c4gi4snnY/2Bq47V+2NraryqqwKem2lcQNo1G7Z+ETZ2bznHVRmVn+IWC8gaMTAUUR j77jPsk7XEeoriwgEljuYGwjQf9TGKnbzYXM/eCD2fPYed2NeGOErDYMxvZJevJnDlFV H6L6Kf58PHsIRGr8p/9T2d5WdXLNvJlCSzeRjen58FdECZbxKrNAG2UoRbjZCj1XIvd5 X/3ZZWrA3LAhXHa+T3unV3cPHr285gJqteyqmdkaSZ0o8WXhYDz6Wm2wX/yhMMbktKqV NOuwelE0uZpzlHKYAWmO64HlqgMnLvv52a9ma4kAdv060/CAyADLrGYRLSVZzG7cP/n3 n/Zg== X-Gm-Message-State: AN3rC/6KLJY6t+6mRKJUy2L5hXlPZznZfu4dOji5P/pwQKGb1PPQ/HH75Uyh3+fcnWES9w== X-Received: by 10.84.193.3 with SMTP id e3mr6490978pld.71.1491588062013; Fri, 07 Apr 2017 11:01:02 -0700 (PDT) Received: from ebiggers-linuxstation.kir.corp.google.com ([100.119.30.131]) by smtp.gmail.com with ESMTPSA id c64sm4747146pfa.110.2017.04.07.11.01.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 07 Apr 2017 11:01:01 -0700 (PDT) From: Eric Biggers To: linux-fscrypt@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, "Theodore Y . Ts'o" , Jaegeuk Kim , Richard Weinberger , Michael Halcrow , Eric Biggers Subject: [PATCH 3/4] f2fs: sync f2fs_lookup() with ext4_lookup() Date: Fri, 7 Apr 2017 10:58:39 -0700 Message-Id: <20170407175840.95740-4-ebiggers3@gmail.com> X-Mailer: git-send-email 2.12.2.715.g7642488e1d-goog In-Reply-To: <20170407175840.95740-1-ebiggers3@gmail.com> References: <20170407175840.95740-1-ebiggers3@gmail.com> Sender: linux-fscrypt-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fscrypt@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Eric Biggers As for ext4, now that fscrypt_has_permitted_context() correctly handles the case where we have the key for the parent directory but not the child, f2fs_lookup() no longer has to work around it. Also add the same warning message that ext4 uses. Signed-off-by: Eric Biggers --- fs/f2fs/namei.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c index 98f00a3a7f50..9a5b9fa55318 100644 --- a/fs/f2fs/namei.c +++ b/fs/f2fs/namei.c @@ -324,9 +324,10 @@ static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry, if (f2fs_encrypted_inode(dir) && (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode)) && !fscrypt_has_permitted_context(dir, inode)) { - bool nokey = f2fs_encrypted_inode(inode) && - !fscrypt_has_encryption_key(inode); - err = nokey ? -ENOKEY : -EPERM; + f2fs_msg(inode->i_sb, KERN_WARNING, + "Inconsistent encryption contexts: %lu/%lu", + dir->i_ino, inode->i_ino); + err = -EPERM; goto err_out; } return d_splice_alias(inode, dentry);