From patchwork Fri Sep 8 00:12:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Halcrow X-Patchwork-Id: 811272 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="F4hHvHWg"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="Ice0QMtg"; 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 3xpHrX23Nsz9s81 for ; Fri, 8 Sep 2017 10:14:52 +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=37dqEE+7VrnzOaJDb43WczJq9s+sb4KVHaJk1y0djEw=; b=F4hHvHWgCSJ5vhYXzMJpXR4P7Q pc6e+IlbdGJi2qNuiI206o2TSmAqvHZ4zzz7FxncBgkYICFnS62DI5ar9welflBv0bjWQoJes729l 2dSTmrPcNinjD7aW4e1uDhOLMCFUefR8LuuKgubNfI46aezDeqbuZCtNYKEjHG0vo5Hi3Hgdb7klE whOrQg0k/IdJsGZDHkwi/bQlbdGWvGfQlxECTf4PpUpBp59YTbW/8HfAb+Iavia9vf/OnUyEi/Wzt EKBOrOu2PGfw8Ziw9r2/enfRCasE31vCFIGyuPy5usmlju9iFrBIMZ+HJVhClPW5uwD5SSUM04lmE cgvq+ekw==; 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 1dq6wX-0008RD-D4; Fri, 08 Sep 2017 00:14:45 +0000 Received: from mail-pg0-x234.google.com ([2607:f8b0:400e:c05::234]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dq6un-0006o5-DR for linux-mtd@lists.infradead.org; Fri, 08 Sep 2017 00:13:00 +0000 Received: by mail-pg0-x234.google.com with SMTP id 188so2116140pgb.2 for ; Thu, 07 Sep 2017 17:12:35 -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=VzkLSlJeRYCLVLtHBOnDTxgB9u1PqKbInpwTOtVP8ew=; b=Ice0QMtgOPM3VaTp8Vrr2EfumHDDeKVnQCPZKM+z5v1EPtyaytZX/2fg1wehZzUuz8 BPO6+BseSzrqBbJuc/4/GAc2Bi/YNF1G6jaAU0ycfCOho/7TjQvKfIMtLHcDpYjXQ4cj 9+7dTFrtUmFoa1S9H6BkPUXMpcieioONW+UaT0P4bFgYAW5n8kWItpTfS3Tjm60njQRt RV3WV9Kn0o+tjlHFo16o9XhyQ7XrBrXcpLetzGEfzbCBhXNyH8WNY70ST6EmFAi5OqnF AlzumS3TqwfrOIdnJ9lfDUWhAOnKgJrL1YcvWORyRdzn7aIUprEortQK9uKqvyciiNeI DALA== 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=VzkLSlJeRYCLVLtHBOnDTxgB9u1PqKbInpwTOtVP8ew=; b=aH5Xv/vWLvCotbMV3z5aFNQRXRPDeTO450T5XC+2bRaQKsF/t5a+xlyvNWZTXSBc0g 5le4mG0wdrkVC/v9GxvFtJ3hnwYDMuyUwl9+P9Dm6y8pEPVMe0VToMMw3Cc3j7x5R0z+ O9wDKjb5BTsTcVKd/yHESlzXM/bD9Ynn/yXj9voDNV4Nuvk0x2uUCcpSomDCZeU8whY6 hEuVDiuSDUrciJahSYp25/mj/vsi0IpUzB562onIpq6IrMnMLpzqQkaFWk0yJHwNgFzP H/suttoihdvRZU/3WSwfDbyc/OhELY++sMwam32Kwq/CS47TQ+NvUDaPDCE+hRBcf01f pfNQ== X-Gm-Message-State: AHPjjUi0U8GGQpmecJoVyItVRAJTlHnfERXhuu9OjrMFT6xFMeZNkefu yjLpIVh2KjtQbuab X-Google-Smtp-Source: ADKCNb77OBNGz8iqrYgB9/+r49OFHEniG2dVLtNf2S2/yzWYKxQ7LZeRnjSt29F8cd6gPZLVWnb7kA== X-Received: by 10.98.15.208 with SMTP id 77mr1189693pfp.318.1504829555043; Thu, 07 Sep 2017 17:12:35 -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.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Sep 2017 17:12:34 -0700 (PDT) From: Michael Halcrow To: linux-fscrypt@vger.kernel.org Subject: [PATCH 2/3] F2FS crypto: Return -EXDEV for link, rename, and cross-rename between incompat contexts Date: Thu, 7 Sep 2017 17:12:03 -0700 Message-Id: <20170908001204.18174-3-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_171257_628365_6A4198AA X-CRM114-Status: UNSURE ( 8.71 ) 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:c05:0:0:0:234 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/f2fs/namei.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c index 760d85223c81..689c671cf8b8 100644 --- a/fs/f2fs/namei.c +++ b/fs/f2fs/namei.c @@ -202,7 +202,7 @@ static int f2fs_link(struct dentry *old_dentry, struct inode *dir, if (f2fs_encrypted_inode(dir) && !fscrypt_has_permitted_context(dir, inode)) - return -EPERM; + return -EXDEV; err = dquot_initialize(dir); if (err) @@ -720,7 +720,7 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, if ((old_dir != new_dir) && f2fs_encrypted_inode(new_dir) && !fscrypt_has_permitted_context(new_dir, old_inode)) { - err = -EPERM; + err = -EXDEV; goto out; } @@ -910,7 +910,7 @@ static int f2fs_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; err = dquot_initialize(old_dir); if (err)