From patchwork Fri Sep 8 00:12:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Halcrow X-Patchwork-Id: 811271 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="lX6qMfA9"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="X+8QJKUG"; 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 3xpHqb0X9fz9s81 for ; Fri, 8 Sep 2017 10:14:03 +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=SUzm24q/Mb01iTTmHl1xGTWc3tSGhUY7Snx3QrevtCg=; b=lX6qMfA9lfbhYSRs5swgUoSNkM mxrHvJmT3pK7a1cx/eEaqkktbctzpPlRF2CerBP15guV6LtRGVISGKlUG3KOHRM/iFOsbToy9Z3xC POc+QgtM2m06RtyDx2uxade0tGucL6BJ6C7kOKUkkV1ePCysjbIsF+puvfXUxdEJfmc8NWaSr+C+Z Qacx21AoDF3KZN89tIv60ktfF7iqvwKYOGrNx+3jkSXjR5EPALvIZ9FVHe0FoZCtJnJ0j+JtgehMz FzraF8HrqYxGNslX43xlNetrQypQEEdWAvGJulwgOC4fA6dGglv71B/UrSGwpdJqmC/Y31xOLo79N 3vHPvbsA==; 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 1dq6vl-0007m3-Dt; Fri, 08 Sep 2017 00:13:57 +0000 Received: from mail-pf0-x22d.google.com ([2607:f8b0:400e:c00::22d]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dq6uj-0006kS-HK for linux-mtd@lists.infradead.org; Fri, 08 Sep 2017 00:12:55 +0000 Received: by mail-pf0-x22d.google.com with SMTP id g13so1916215pfm.2 for ; Thu, 07 Sep 2017 17:12:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=p/JV/GCGMlQrRMcB4xRDJuCDYFD95LtSDYEi9esBWvE=; b=X+8QJKUGY7vzJmz1iJqV7GgxdVNqS9/WTdbYgoM0ccLCQ8WCb22kSXO2NIEoqeWp1V biRx0eMrH2fcv59BcrJEBptKQ6VuNa1ffqzmdbHdoRNgvcU3FP8GHtAz/tU3JSuH4bog y5G6a9uEpSaija1ypRMP1gFX0B/K7uUX8FRAGpAZemGkFBMIRh2Hhl9/oBSxRCvtNZB0 AYlk0WsvRwkH2QKr57dF34YQkFjrkhSMD2gD+DzdE+Tlmwong3syLfRatU5W5LNELlLz 7Mrk3Z01AXfJvr7TZrF9F2QvwAIYykMHw/bY7r2yoO0faf5hu5BT/dEaIp4EJzMzqEKF DBNg== 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=p/JV/GCGMlQrRMcB4xRDJuCDYFD95LtSDYEi9esBWvE=; b=JHMvrHy0wSAbYUewerKaiB+jazjvRtadfkmhPisMXkCHZYfWIZtuxqgAYD2jFq+qRc vQjG6JUI8eMCteV5QPtlBV3JNBIgqULngzaFBgCH11hClkpVFNgkcROtFbyeCqvYq3Qc 9VYHS5Nt8QtDrheKrjSvCVeGwniAoTfg6qSLtEC3uo1BGe38QNGBr1PYe8GMC+GhMPBb tl+KFXuyPRxq5e5l71NwVe3+cyJMzDFpdnJFJnh7jlxkOcYVquSTTvjvwVCPRxboKhBq jqKpir0HUlNloGZC7RWvkCZCEvhtuibBj878ge6+6nkAOtIC08AqeMpZaqyEPH1bUy3v 86AQ== X-Gm-Message-State: AHPjjUgZfiREi0cPTpxd1HWDgaLpqM9Ab7tBOmKw3AMvxiv/OjztgyON T3tFy/VwaH1MrKC3 X-Google-Smtp-Source: ADKCNb7gVRvszoGixNODZzDTX4Rg+1Ssu6aS33fYta90PO6l576fJYafIE3T8CDNkWqEoCl4XzYMoA== X-Received: by 10.98.236.81 with SMTP id k78mr1227570pfh.336.1504829551886; Thu, 07 Sep 2017 17:12:31 -0700 (PDT) Received: from mhalcrow-linux.kir.corp.google.com ([100.66.175.61]) by smtp.gmail.com with ESMTPSA id d25sm1007805pfb.1.2017.09.07.17.12.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Sep 2017 17:12:31 -0700 (PDT) From: Michael Halcrow To: linux-fscrypt@vger.kernel.org Subject: [PATCH 1/3] ext4 crypto: Return -EXDEV for link, rename, and cross-rename between incompat contexts Date: Thu, 7 Sep 2017 17:12:02 -0700 Message-Id: <20170908001204.18174-2-mhalcrow@google.com> X-Mailer: git-send-email 2.14.1.581.gf28d330327-goog In-Reply-To: <20170908001204.18174-1-mhalcrow@google.com> References: <20170908001204.18174-1-mhalcrow@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170907_171253_774131_B0159A04 X-CRM114-Status: UNSURE ( 8.54 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.5 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (0.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:400e:c00:0:0:0:22d listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.5 SUSPICIOUS_RECIPS Similar addresses in recipient list -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -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: linux-fsdevel@vger.kernel.org, linux-mtd@lists.infradead.org, linux-ext4@vger.kernel.org, tytso@mit.edu, linux-f2fs-devel@lists.sourceforge.net MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Gives user space the opportunity to fall back to copy-and-delete. Signed-off-by: Michael Halcrow --- fs/ext4/namei.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index c1cf020d1889..3c493bc4273d 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -3223,7 +3223,7 @@ static int ext4_link(struct dentry *old_dentry, return -EMLINK; if (ext4_encrypted_inode(dir) && !fscrypt_has_permitted_context(dir, inode)) - return -EPERM; + return -EXDEV; if ((ext4_test_inode_flag(dir, EXT4_INODE_PROJINHERIT)) && (!projid_eq(EXT4_I(dir)->i_projid, @@ -3552,7 +3552,7 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, if ((old.dir != new.dir) && ext4_encrypted_inode(new.dir) && !fscrypt_has_permitted_context(new.dir, old.inode)) { - retval = -EPERM; + retval = -EXDEV; goto end_rename; } @@ -3732,7 +3732,7 @@ static int ext4_cross_rename(struct inode *old_dir, struct dentry *old_dentry, (old_dir != new_dir) && (!fscrypt_has_permitted_context(new_dir, old.inode) || !fscrypt_has_permitted_context(old_dir, new.inode))) - return -EPERM; + return -EXDEV; if ((ext4_test_inode_flag(new_dir, EXT4_INODE_PROJINHERIT) && !projid_eq(EXT4_I(new_dir)->i_projid,