From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E241C388F7 for ; Tue, 3 Nov 2020 21:02:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4841420658 for ; Tue, 3 Nov 2020 21:02:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604437339; bh=GXn9SUQ/vYrUY9YRnVP4GX2jDPIuBGR1SZxsAW7cmqk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Uj8DsL2tOH4Etb4FKV61BY5LlbcGhkMMW531mQXBa9rl8Z34uSyGrjAD2F31bNnha 5u4nNbSAOqOogkjPH+oC8a24KTJyeX7Y4/rd95wdeK3annJICcC6H90V/srSL5pEDR RfjLj1BBBeeqIPPjn2y8Z+Ug8FmxdaT0olTAkyLQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387606AbgKCVCS (ORCPT ); Tue, 3 Nov 2020 16:02:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:39238 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732120AbgKCVCQ (ORCPT ); Tue, 3 Nov 2020 16:02:16 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2201020658; Tue, 3 Nov 2020 21:02:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604437335; bh=GXn9SUQ/vYrUY9YRnVP4GX2jDPIuBGR1SZxsAW7cmqk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NQltznUzBHSlRXiwGhVQag5y9AGYX+hjAWNEP1jxYO7pRf2OtaXQNW01lFowvz4jE FgIFP818Ey34PXzeFMyzOcACgyhTF/kGZ29R6UJZHNT/QvRAVbfuHO/gFcQbYlNRoR qDLKWZyUgID1bJZkK8CYM/zyHikcxhpybNqjkdQY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , Sarthak Kukreti , Eric Biggers , Theodore Tso Subject: [PATCH 4.19 032/191] fs, fscrypt: clear DCACHE_ENCRYPTED_NAME when unaliasing directory Date: Tue, 3 Nov 2020 21:35:24 +0100 Message-Id: <20201103203236.879284047@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203232.656475008@linuxfoundation.org> References: <20201103203232.656475008@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Eric Biggers commit 0bf3d5c1604ecbbd4e49e9f5b3c79152b87adb0d upstream. Make __d_move() clear DCACHE_ENCRYPTED_NAME on the source dentry. This is needed for when d_splice_alias() moves a directory's encrypted alias to its decrypted alias as a result of the encryption key being added. Otherwise, the decrypted alias will incorrectly be invalidated on the next lookup, causing problems such as unmounting a mount the user just mount()ed there. Note that we don't have to support arbitrary moves of this flag because fscrypt doesn't allow dentries with DCACHE_ENCRYPTED_NAME to be the source or target of a rename(). Fixes: 28b4c263961c ("ext4 crypto: revalidate dentry after adding or removing the key") Reported-by: Sarthak Kukreti Signed-off-by: Eric Biggers Signed-off-by: Theodore Ts'o Signed-off-by: Greg Kroah-Hartman --- fs/dcache.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) --- a/fs/dcache.c +++ b/fs/dcache.c @@ -2713,6 +2713,20 @@ static void copy_name(struct dentry *den } /* + * When d_splice_alias() moves a directory's encrypted alias to its decrypted + * alias as a result of the encryption key being added, DCACHE_ENCRYPTED_NAME + * must be cleared. Note that we don't have to support arbitrary moves of this + * flag because fscrypt doesn't allow encrypted aliases to be the source or + * target of a rename(). + */ +static inline void fscrypt_handle_d_move(struct dentry *dentry) +{ +#if IS_ENABLED(CONFIG_FS_ENCRYPTION) + dentry->d_flags &= ~DCACHE_ENCRYPTED_NAME; +#endif +} + +/* * __d_move - move a dentry * @dentry: entry to move * @target: new dentry @@ -2787,6 +2801,7 @@ static void __d_move(struct dentry *dent list_move(&dentry->d_child, &dentry->d_parent->d_subdirs); __d_rehash(dentry); fsnotify_update_flags(dentry); + fscrypt_handle_d_move(dentry); write_seqcount_end(&target->d_seq); write_seqcount_end(&dentry->d_seq);