From patchwork Wed Sep 20 22:45:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 816617 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="ex8SPY/c"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="apy5jgxF"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="i0GLmEHH"; 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 3xyGjR5WP2z9s7h for ; Thu, 21 Sep 2017 09:51:23 +1000 (AEST) 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=aGVi0rTlLGT477BX9LNO575++vdY8gcbEvie0WB9gyo=; b=ex8SPY/cH/JE+p/fCA541obI3J WnK7HlblzIchqXFeBPL4FyCDpyc/LaV2k9q+/pdOSimsDNLS6g0nALr9Yk03M+AuIrSy5SMfg7xTe B+wrMUtCYHp/jKXssZsmlyQnRwMgV+AT+/g9co8dWosKfUXnNC6UC0EJmiobRiQ2kgkT8A2CXx110 C3aeetmQwjQmq3YajIUTok/PwWci1AzNktS+2Sbn9LgLeJNXw0V0YCIYGuuOFA2z4nDpdRen0ZMqG QAe7djaZRK4qVPgI0ykk7J1tTT4lFWT5zm1ypl4bjxmuxd48KJe7+SbT8bZUiQhkqeBBp91ti/yra D+o9YAtQ==; 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 1duols-0003TZ-5G; Wed, 20 Sep 2017 23:51:12 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1duok4-0001Bu-T1 for linux-mtd@bombadil.infradead.org; Wed, 20 Sep 2017 23:49:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.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=sM58lWxHc4E394SB2Muu1uxUp2WU4oewgYhWHZMbS9o=; b=apy5jgxFim6YWYbILf6awLeKe HUV/VG9em4Ss79p+dd0G48vnndfB9N0P5mHTtVZtXyjjRCmtwWtFmmWAwVZ+TkrTi8s7kzXIr7jVK wtZpRciWzp/9cA8WvM3BkU3kULP0YFepygOHWnq0U4GdaHuNliAxi/U3A6gJw63XeJj+JkrUeCfCI In/u18NrkfSzJ3CiuHQ9uDJzCRrz2sRUFWM7RSHrX+VmXRDH2d1KDH9o8wCyfhXOXpzw1TRwjG9z0 0eeVO/N6jDb68O1nxtd8Qfx4FcOT7VRqNKeu6PFwvwJ32v0xiIgi1OkqnoXH+FwKZVM45Oc3MyQyB 9GqwBRgLg==; Received: from mail-pg0-x244.google.com ([2607:f8b0:400e:c05::244]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dunmC-00017U-QU for linux-mtd@lists.infradead.org; Wed, 20 Sep 2017 22:47:29 +0000 Received: by mail-pg0-x244.google.com with SMTP id i130so2381469pgc.0 for ; Wed, 20 Sep 2017 15:47:07 -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=sM58lWxHc4E394SB2Muu1uxUp2WU4oewgYhWHZMbS9o=; b=i0GLmEHHUqOLF8/hYgw1I9Lx1Xa6pZ3BJ9xw76nCuU3Wi3J+9HZpXlHE1Cgnhn/GTh 1SJ/MyrGdkN6g8Jj8G1drhk1Da/QU5kX1AwPHiVLUIwezn0sUZhWkAlUTnrTFtkrbsax EsEbGjycZr9tkTVnT/P0/fvCi8XHyRzaZgD4/KgLXlJPab7LTSdQiUhdBeB4mul+ZVh7 MXDe2mowsVbdSViijhHggwHgyyZN89bJ3rPZFbVoOP4oboPnojjORJRXRSdKyOhaNk3/ 2alsw4H3nZa9Etp+VG3ZUMM+HBQPQ37OodMnRwcwIcoaN5OQeG6uhImia8FiXrNY9eEa 5Ilg== 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=sM58lWxHc4E394SB2Muu1uxUp2WU4oewgYhWHZMbS9o=; b=renIIeW7S2TlRFS3RJbd3ElNp4WlZIn1WCZUkep4culwblHJa835eYnmQzPLFs6UC4 N+s5s6XQwGb77/TvZfPYdqDVALX9TQyjG4rbkqsm+F4oU7mwLYLZbh3efUuNKQ8TiSNs sy26PiXd50Zm1nnwz7HFXPVVgXb5xlzFJdJ6ZBLTWZk/I8yDbzE5An/XMljN1kVsqG6/ J0DAClxqOwuGtAhP9Yhq8Kk95ckHocfU1AcpsyVig/0zpNPdVpFNesHb6VFSzi7zVZ13 hWicG+ngBkY7CCaDgiY5SXBC7SYFrbUbuUFDoos8CTzb6MEQ5hYGXlrQe8FtdZj0DMT8 7/1w== X-Gm-Message-State: AHPjjUgCohmCSKwC9Q9tlnQkSDMYtBPfsi6A5bvQXTiRxJQF+yIwh/0p 2/nBfDMRVzv7yMi+xZcNAlw= X-Google-Smtp-Source: AOwi7QBP6a6x8P7lbYDp/n2H5C8yfjymALkj4exutY4HP6wfeN1bSxg3GvqR2viIi+V6/h4RrOr80Q== X-Received: by 10.99.4.7 with SMTP id 7mr3538064pge.400.1505947625571; Wed, 20 Sep 2017 15:47:05 -0700 (PDT) Received: from ebiggers-linuxstation.kir.corp.google.com ([100.66.174.81]) by smtp.gmail.com with ESMTPSA id j2sm6249pgn.26.2017.09.20.15.47.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Sep 2017 15:47:05 -0700 (PDT) From: Eric Biggers To: linux-fscrypt@vger.kernel.org Subject: [PATCH 13/25] ext4: switch to fscrypt_prepare_rename() Date: Wed, 20 Sep 2017 15:45:53 -0700 Message-Id: <20170920224605.22030-14-ebiggers3@gmail.com> X-Mailer: git-send-email 2.14.1.821.g8fa685d3b7-goog In-Reply-To: <20170920224605.22030-1-ebiggers3@gmail.com> References: <20170920224605.22030-1-ebiggers3@gmail.com> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.8 (-) X-Spam-Report: SpamAssassin version 3.4.1 on merlin.infradead.org summary: Content analysis details: (-1.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:400e:c05:0:0:0:244 listed in] [list.dnswl.org] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (ebiggers3[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 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_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 -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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: "Theodore Y . Ts'o" , Eric Biggers , Michael Halcrow , linux-f2fs-devel@lists.sourceforge.net, linux-mtd@lists.infradead.org, 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 Signed-off-by: Eric Biggers --- fs/ext4/namei.c | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index b2058500f1dc..b2fbc2b87bcf 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -3516,12 +3516,6 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, EXT4_I(old_dentry->d_inode)->i_projid))) return -EXDEV; - if ((ext4_encrypted_inode(old_dir) && - !fscrypt_has_encryption_key(old_dir)) || - (ext4_encrypted_inode(new_dir) && - !fscrypt_has_encryption_key(new_dir))) - return -ENOKEY; - retval = dquot_initialize(old.dir); if (retval) return retval; @@ -3550,13 +3544,6 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, if (!old.bh || le32_to_cpu(old.de->inode) != old.inode->i_ino) goto end_rename; - if ((old.dir != new.dir) && - ext4_encrypted_inode(new.dir) && - !fscrypt_has_permitted_context(new.dir, old.inode)) { - retval = -EPERM; - goto end_rename; - } - new.bh = ext4_find_entry(new.dir, &new.dentry->d_name, &new.de, &new.inlined); if (IS_ERR(new.bh)) { @@ -3722,19 +3709,6 @@ static int ext4_cross_rename(struct inode *old_dir, struct dentry *old_dentry, int retval; struct timespec ctime; - if ((ext4_encrypted_inode(old_dir) && - !fscrypt_has_encryption_key(old_dir)) || - (ext4_encrypted_inode(new_dir) && - !fscrypt_has_encryption_key(new_dir))) - return -ENOKEY; - - if ((ext4_encrypted_inode(old_dir) || - ext4_encrypted_inode(new_dir)) && - (old_dir != new_dir) && - (!fscrypt_has_permitted_context(new_dir, old.inode) || - !fscrypt_has_permitted_context(old_dir, new.inode))) - return -EPERM; - if ((ext4_test_inode_flag(new_dir, EXT4_INODE_PROJINHERIT) && !projid_eq(EXT4_I(new_dir)->i_projid, EXT4_I(old_dentry->d_inode)->i_projid)) || @@ -3861,12 +3835,19 @@ static int ext4_rename2(struct inode *old_dir, struct dentry *old_dentry, struct inode *new_dir, struct dentry *new_dentry, unsigned int flags) { + int err; + if (unlikely(ext4_forced_shutdown(EXT4_SB(old_dir->i_sb)))) return -EIO; if (flags & ~(RENAME_NOREPLACE | RENAME_EXCHANGE | RENAME_WHITEOUT)) return -EINVAL; + err = fscrypt_prepare_rename(old_dir, old_dentry, new_dir, new_dentry, + flags); + if (err) + return err; + if (flags & RENAME_EXCHANGE) { return ext4_cross_rename(old_dir, old_dentry, new_dir, new_dentry);