From patchwork Wed Sep 20 22:46:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 816581 X-Patchwork-Delegate: richard@nod.at 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="dYgSXTmq"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="I9iv+aSb"; 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 3xyFQb21Kkz9sBZ for ; Thu, 21 Sep 2017 08:53:27 +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=lN6EHUGjShgOrlU+JbX3MP09U9Z56zHJ4KUvm08PCXs=; b=dYgSXTmqfiPicJaRJ9E2hwSt4i Cw80g/yYsQuYxDexH6M7psHQrXQjJoixc8R3l8kQkGEnF0os8DQAevG7lBfWQN/qlVOsb9WgTnimE XzHYuN5mFls7TIiOAGbgSnmNYdI/7pJtfpdCfKOCfF4VtWjZX2e/RrR3Xq6OHviKOb9i3mT7pXtIr sX0ONjY0EFCXtw9wcpDoX7uYozM3OM61z+BqPYQREQytMbzidx8Zy0LnjE0GIpOnkdohgAXdD5ES9 pcdOgcvm8HTBHVy3rHnA3Apuejny2HW3SwWvShZvyjZcKSM9XXK5sncyh8UxnqVpBg5dcM4Zd5muh QHXSfc/w==; 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 1dunro-0002Gn-0X; Wed, 20 Sep 2017 22:53:16 +0000 Received: from mail-pf0-f195.google.com ([209.85.192.195]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dunmM-00056h-GI for linux-mtd@lists.infradead.org; Wed, 20 Sep 2017 22:47:42 +0000 Received: by mail-pf0-f195.google.com with SMTP id i23so1721494pfi.2 for ; Wed, 20 Sep 2017 15:47:17 -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=doywBDCY0Q86VZC6d+ZGKrHg7RVLKcPpcs6GqWDIrmE=; b=I9iv+aSbRnSB3KdNsisa7YE6rsTLg9O2jiqhDU9ZHcbmeYLNCU9zKwoiFNQgLSc2m3 PU1dLoyOBGGfL8O9J0UDmuWvr8GbzdN6jFxgR+zZKV9UDRAs2GPr29U6hbmPhdVYK4c9 6u1Jhdk7nNPzhCZdmJIJHoHbsGLK3WaCj6HM05RfzvQm9BB6OaIyC1THIBr8W+hKGvqf Qnj1qlhk/04lYpd0lhxkZ190JC2AJn17R42tOqIq77bbA+WVOpuVlYcqX7lg1ln0vYLn fLjZoYMkcsicNpQyiIfTFgyRoAreE8yWs4kXbN2S+WpAwXqtiuaO3vNtitZ2RtQtrl/V aq+g== 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=doywBDCY0Q86VZC6d+ZGKrHg7RVLKcPpcs6GqWDIrmE=; b=jWN1rK6qKl6PjCtpyaVyZgU7+QxDhjsFaAj8G/cu/aHa5cDnrBZn163FK3+D+WV+0W m+a2csLiGFjy4CBnIYDuW8EXFULeRj7pqYEJQARS+Gqkvi4ZlY+SWTlw0+j3bmmgbb5x Xok0HtemuFmKPPGwK4cHH5oLRuWmphpB1/acKe4cTWpfYGfZGvV74vVAzZynWYZVU0Cu v7YIr/JKZkkllmd6QitgDReV96AbDLwwLPsKLsFyUmo2jIGe8Q/K3eyFR+6q2ieBkT6g PGU1qN8/LnrzpguYBX0r8nsvV/ewG3GFFcQvLvDrjjCPB+ALD0GyrVyVCZnSquD14HWv Oidw== X-Gm-Message-State: AHPjjUi2wkYS62MRyeoP89CRB59hstSwrx+xrRY7rwiJl4znPTYxiTqW nIs3nkWRcp/BwGGYOzseKm7FpkUYrJo= X-Google-Smtp-Source: AOwi7QCk3DgxO56V+1yhmSHJSNLy5Sgo/Xo9MNVr41WCKhY8WHCDCudNrmPYpYNO/FULhI/11scMOg== X-Received: by 10.84.238.143 with SMTP id v15mr3611995plk.303.1505947637247; Wed, 20 Sep 2017 15:47:17 -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.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Sep 2017 15:47:16 -0700 (PDT) From: Eric Biggers To: linux-fscrypt@vger.kernel.org Subject: [PATCH 24/25] ubifs: switch to fscrypt_prepare_lookup() Date: Wed, 20 Sep 2017 15:46:04 -0700 Message-Id: <20170920224605.22030-25-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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170920_154739_763281_926C08AC X-CRM114-Status: GOOD ( 10.87 ) X-Spam-Score: -4.0 (----) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-4.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.5 RCVD_IN_SORBS_SPAM RBL: SORBS: sender is a spam source [209.85.192.195 listed in dnsbl.sorbs.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.192.195 listed in list.dnswl.org] -2.8 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.192.195 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (ebiggers3[at]gmail.com) 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_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: "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/ubifs/dir.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index 7bf847d79b4a..a2ea4856e67b 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c @@ -220,20 +220,9 @@ static struct dentry *ubifs_lookup(struct inode *dir, struct dentry *dentry, dbg_gen("'%pd' in dir ino %lu", dentry, dir->i_ino); - if (ubifs_crypt_is_encrypted(dir)) { - err = fscrypt_get_encryption_info(dir); - - /* - * DCACHE_ENCRYPTED_WITH_KEY is set if the dentry is - * created while the directory was encrypted and we - * have access to the key. - */ - if (fscrypt_has_encryption_key(dir)) - fscrypt_set_encrypted_dentry(dentry); - fscrypt_set_d_op(dentry); - if (err && err != -ENOKEY) - return ERR_PTR(err); - } + err = fscrypt_prepare_lookup(dir, dentry, flags); + if (err) + return ERR_PTR(err); err = fscrypt_setup_filename(dir, &dentry->d_name, 1, &nm); if (err)