Message ID | 20170920224605.22030-23-ebiggers3@gmail.com |
---|---|
State | Deferred |
Delegated to: | Richard Weinberger |
Headers | show
Return-Path: <linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> 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=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="RYKFRJ7+"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="kI43+5ar"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="V05ytSsS"; 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 3xyGhN3lMQz9sPm for <incoming@patchwork.ozlabs.org>; Thu, 21 Sep 2017 09:50:26 +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=f3OL3WY2I/4wH5iQ18aT0h8mU8yXM488bTD8Mba66So=; b=RYKFRJ7+7ABn6cdVytCO4heVEl 1N3cnGZEc5uTQb/ZuOAPe0j4uZR0LogciFVG8ms9eX6tmERqcS5u+lRW4jdtM8T/OBtTWurJa1gQt d31fNAsM6ImQGzQMfNHlmUp/REpKWkBSerFU48GyTWh8Bl0Cxt1VuiuMV3aLqeamkMAQVgnFkq2Pi MYwuKgcmB+E6K2Kd4RA1JhjLMJy31uUCQFY77xV9knAm9aGdDuJI7NQ7fCuU3W7h3mayyJ8h/sCQk ww4XPEaGLq4+tn7Ae10yhxa0Qpbo5TKpK4w7GDPiRq2NlQnFDuxGhsD1WwQOmWlnBG5diOrOliitf 7aNJ55vw==; 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 1duokz-000298-Fr; Wed, 20 Sep 2017 23:50:17 +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 1duok1-0001Bu-91 for linux-mtd@bombadil.infradead.org; Wed, 20 Sep 2017 23:49:17 +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=5PybDI8cOBLVG5Z56DnOikm/sdc+J5uxv9MOaClgZv8=; b=kI43+5arX1kom2s+tTuNVCFE5 o+T6laPGNfUPODcf8pJLKdeTVVIZDBEwdjqRb/cNwxgZc4ZtEu85vq5KN1ndEcgnK9HD8EyV0fAlc eAxzO7PdiLZ2cz3gjvdg8REY9s4F4vRB4dI5pqV17oE6YKauS31pyzf+P8/vrjv3OStCybuz5m1dd npUeji4kG7YD9mX63uxsS26uf+wNsokKFDaYGkzC0WSUZZx/NoV54vsiwNK7bB9Lgqlj93lVMg8fF Tsd3UM/WVOty8Og3az+ejPLQ3UfBR+UNm/v2Y09VXUsnuRKXwhqmnVfZVnmwcEXbCz3RHfgB5qSfH 6G0yPr0SQ==; Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dunmL-00017k-98 for linux-mtd@lists.infradead.org; Wed, 20 Sep 2017 22:47:38 +0000 Received: by mail-pf0-x243.google.com with SMTP id a7so1717877pfj.5 for <linux-mtd@lists.infradead.org>; Wed, 20 Sep 2017 15:47:16 -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=5PybDI8cOBLVG5Z56DnOikm/sdc+J5uxv9MOaClgZv8=; b=V05ytSsSDj5vTsHc+JjgI6Dh20+zZvEoYZwWXLhmSXtS4/SYb1cyTTv3IYBCsk8C+s cy9JmacRCKl1oUloYgqIA5fHhpQdjvi4tovsIqgGhUURQqpbzDLprFO19xIQwNmEX3Bi WgdmvJyQCfs49p/BbzyPTFbX3FOXYwegwgQJQDXXgddjXC7QbI5MVNK+pn+kDiCuTKlC PnsfS5cMT+LTumsW1+fTSCiC6mOQQCyhcfNTItgbiVjLBPSI8njYRrIvoekpI1DaPlRw fd9NHeqi1AHQVc3PHZt+EVb7f3VogdsNeemX05J91iqdoDqzbWZKckNGjSVpVWeD/pXb 7IWw== 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=5PybDI8cOBLVG5Z56DnOikm/sdc+J5uxv9MOaClgZv8=; b=TN4w6iYbHhuulZxFU42/jCbQiNYSCPF203uvHPqAxnAgAyWrIWai/4RPEiUcK0sBiy a9PH4i7uMltqjvfYxDx0TL9LUeOW9siNVRuWFfAqzDqMjM17kWnOvFF+p5VOFTUBN4WX kBmsd2juLR/RuCrOJuI1poDxkoMjwHX7tmfHJj5LBuH+gpnZyrpVCUEOD0ZUdVcdLUGm Svp925o6fhkBn17uOlT7K1zkyokRgRTwG6e9a+qswD4T4d73XLJi/v3Zb3A87DcbD/Aq D2X5+Vt28KR7C1UXM8k+n2cqa0X/Un2AGpGd82I5sPGT1Nl39hwAsmJqdIukbTMaG34D zSkQ== X-Gm-Message-State: AHPjjUjxUnehy3J4Gx3LEAQJQFXBAMgH7v8VU7S5cCiywAEAzPVLjQC7 mCDGI2EnwdBoIjvlrmyyYsY= X-Google-Smtp-Source: AOwi7QBhgnei7emHNPiDdv42pXNMtV8cAULQVh4gYzVxNsjQAaDxxn8QVvVoll8R84v6AleUqXZ5ig== X-Received: by 10.84.211.36 with SMTP id b33mr3625976pli.47.1505947635030; Wed, 20 Sep 2017 15:47:15 -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.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Sep 2017 15:47:14 -0700 (PDT) From: Eric Biggers <ebiggers3@gmail.com> To: linux-fscrypt@vger.kernel.org Subject: [PATCH 22/25] ubifs: switch to fscrypt_prepare_link() Date: Wed, 20 Sep 2017 15:46:02 -0700 Message-Id: <20170920224605.22030-23-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:c00:0:0:0:243 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 <linux-mtd.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-mtd>, <mailto:linux-mtd-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-mtd/> List-Post: <mailto:linux-mtd@lists.infradead.org> List-Help: <mailto:linux-mtd-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-mtd>, <mailto:linux-mtd-request@lists.infradead.org?subject=subscribe> Cc: "Theodore Y . Ts'o" <tytso@mit.edu>, Eric Biggers <ebiggers@google.com>, Michael Halcrow <mhalcrow@google.com>, linux-f2fs-devel@lists.sourceforge.net, linux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org, Jaegeuk Kim <jaegeuk@kernel.org>, linux-ext4@vger.kernel.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-mtd" <linux-mtd-bounces@lists.infradead.org> Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org |
Series |
fscrypt: add some higher-level helper functions
|
expand
|
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index 417fe0b29f23..09e6c56b11bc 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c @@ -743,9 +743,9 @@ static int ubifs_link(struct dentry *old_dentry, struct inode *dir, ubifs_assert(inode_is_locked(dir)); ubifs_assert(inode_is_locked(inode)); - if (ubifs_crypt_is_encrypted(dir) && - !fscrypt_has_permitted_context(dir, inode)) - return -EPERM; + err = fscrypt_prepare_link(old_dentry, dir, dentry); + if (err) + return err; err = fscrypt_setup_filename(dir, &dentry->d_name, 0, &nm); if (err)