From: Theodore Ts'o Subject: [PATCH 10/22] ext4 crypto: validate context consistency on lookup Date: Thu, 2 Apr 2015 18:10:47 -0400 Message-ID: <1428012659-12709-11-git-send-email-tytso@mit.edu> References: <1428012659-12709-1-git-send-email-tytso@mit.edu> Cc: jaegeuk@kernel.org, mhalcrow@google.com, Theodore Ts'o To: Ext4 Developers List Return-path: Received: from imap.thunk.org ([74.207.234.97]:48007 "EHLO imap.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752376AbbDBWNE (ORCPT ); Thu, 2 Apr 2015 18:13:04 -0400 In-Reply-To: <1428012659-12709-1-git-send-email-tytso@mit.edu> Sender: linux-ext4-owner@vger.kernel.org List-ID: Change-Id: Ifb904b2bec9300b178062ee70cbdfd333f03f865 Signed-off-by: Michael Halcrow Signed-off-by: Theodore Ts'o --- fs/ext4/namei.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 2fb55fd..12d2592 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1418,6 +1418,13 @@ static struct dentry *ext4_lookup(struct inode *dir, struct dentry *dentry, unsi return ERR_PTR(-EIO); } } + if (ext4_encrypted_inode(dir) && + !ext4_is_child_context_consistent_with_parent(dir, + dentry->d_inode)) { + printk(KERN_ERR "%s: Security warning: Inconsistent contexts\n", + __func__); + return ERR_PTR(-EINVAL); + } return d_splice_alias(inode, dentry); } -- 2.3.0