Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S978486AbdDXVqi (ORCPT ); Mon, 24 Apr 2017 17:46:38 -0400 Received: from mail.sigma-star.at ([95.130.255.111]:45996 "EHLO mail.sigma-star.at" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S978420AbdDXVq3 (ORCPT ); Mon, 24 Apr 2017 17:46:29 -0400 From: Richard Weinberger To: linux-mtd@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-fscrypt@vger.kernel.org, david@sigma-star.at, David Oberhollenzer , Richard Weinberger Subject: [PATCH] ubifs: Return -ENOKEY from rename if encryption keys are missing Date: Mon, 24 Apr 2017 23:46:21 +0200 Message-Id: <1493070381-20075-1-git-send-email-richard@nod.at> X-Mailer: git-send-email 2.7.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1458 Lines: 41 From: David Oberhollenzer If either source or destination directory is encrypted and the encryption key is unknown, make sure we return -ENOKEY instead of -EPERM, similar to how this case is handled in ext4. Signed-off-by: David Oberhollenzer Signed-off-by: Richard Weinberger diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index ff77a0aa2f2b..c342f23581d2 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c @@ -1340,6 +1340,12 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry, if (unlink) ubifs_assert(inode_is_locked(new_inode)); + if ((ubifs_crypt_is_encrypted(old_dir) && + !fscrypt_has_encryption_key(old_dir)) || + (ubifs_crypt_is_encrypted(new_dir) && + !fscrypt_has_encryption_key(new_dir))) + return -ENOKEY; + if (old_dir != new_dir) { if (ubifs_crypt_is_encrypted(new_dir) && !fscrypt_has_permitted_context(new_dir, old_inode)) @@ -1564,6 +1570,12 @@ static int ubifs_xrename(struct inode *old_dir, struct dentry *old_dentry, ubifs_assert(fst_inode && snd_inode); + if ((ubifs_crypt_is_encrypted(old_dir) && + !fscrypt_has_encryption_key(old_dir)) || + (ubifs_crypt_is_encrypted(new_dir) && + !fscrypt_has_encryption_key(new_dir))) + return -ENOKEY; + if ((ubifs_crypt_is_encrypted(old_dir) || ubifs_crypt_is_encrypted(new_dir)) && (old_dir != new_dir) && -- 2.7.3