Message ID | 20170920224605.22030-13-ebiggers3@gmail.com |
---|---|
State | Not Applicable |
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="BUW1eIkN"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="oapFNLH6"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Q89+YTOg"; 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 3xyFwN0pQSz9sNr for <incoming@patchwork.ozlabs.org>; Thu, 21 Sep 2017 09:15:48 +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=j3Ws6N8ej0VeY2c7pA0UVP43eH4aguhRxWIJv53xovo=; b=BUW1eIkN4Y1Pz0XSvMWykbiNh+ Dz+VYjX1zrJu58zEt0Ghg1kcqltyh5mXeNNWBV1DkzDPbDDmF+tjsR2qAYIamnO0ZPCH2FOT9dTDC IdWRN3f66cvCxb9+zQZN5bLlUm3oj83YdQ7hxn26pDXZuJwNS7T/Q9mrdeSa/dZ0M7eefPKcJUG6t 6oLENLCATCKlvuqV+sUnZa5nIh0H8bG636iefCxJAIqxuGIzHlFW5r4WCtq9W9Zy7HpGyZhkLosGQ MpaHc7AfwVyiZAehZYl+UIr+n/vTIb5jcTkvkUiymIvZqHfwkck7Nv8oQNrhgF1RmhOx2zRsxDRTx ozXs9csw==; 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 1duoDZ-0002V9-0K; Wed, 20 Sep 2017 23:15:45 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1duoAr-0006j8-9V for linux-mtd@bombadil.infradead.org; Wed, 20 Sep 2017 23:12:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.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=Qwl8pXoUQ+pxfRR5zWcCq2FLYmToeYnmgMTcVFokUF4=; b=oapFNLH607A6Enyl1w0K0B6mf lpY8nZDhSnuyTSGyUEBsGs8+6qEY01+/8odS4bZp5n47CqNlU6fgl2XJAdcKwtzmesUbYghtfJdZ5 JyLGZNXCzJttTvmuiGyLKStaQZLtRUFh25IAwXqt4DlDvxW9qu5f9pMx+cTRvQG1e2dDp44MxxDsv FfHvPOfJuuhWqYSUM+OTkXYfpTLLUoVWkwpOcnJ8IAlOI6Rk8rJt2LEJ1aigMZaSo1t5NgNWSrQV+ j1ucVrFDWEjuBZCuL9NPtazYwYfH+ILNy2Y8p+d+a0UTEygERo+ayVrlhnGODqGmMcLUGiRKUrodm 7utIfirXg==; Received: from mail-pg0-x243.google.com ([2607:f8b0:400e:c05::243]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dunmA-0004sj-62 for linux-mtd@lists.infradead.org; Wed, 20 Sep 2017 22:47:27 +0000 Received: by mail-pg0-x243.google.com with SMTP id d8so2372837pgt.3 for <linux-mtd@lists.infradead.org>; Wed, 20 Sep 2017 15:47:05 -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=Qwl8pXoUQ+pxfRR5zWcCq2FLYmToeYnmgMTcVFokUF4=; b=Q89+YTOgMuzQDhgqeYooAHwEcdoQV02UXDz8Dj3gBVDyoxoGgtbQpmic4gvyxq0CIX Fsm64qFTcYzjUuR/kG9ZmZjjUhkqplTzkRMqTjiC+frcvHgNFKtoNZqoTPibReIdS/VQ hFzFwccG5rcwvBbIKTA3BsHFoShy7k2gzR7RsqSn108WmlHPUtzYRlGohAEY+mfwCVVK uV5KBjuOZu6+OgoF+HR6g7v096e5qkOq718eLJ+uhDaoOMbfZ0emo+paCAKDHcr+1G2u J2KCOk+vbtnULsQHSPUPBmJSTPOhBd5xIksY0pw3eQOOxuq63s5UGQNBKx/WLE2pyYvB Nelg== 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=Qwl8pXoUQ+pxfRR5zWcCq2FLYmToeYnmgMTcVFokUF4=; b=s8TRo9Wg0A/VnWreHNAaQHRgBEiVAM+jcj1dijgsas5leGVtjVcC4BZY0rQsUyvyET Dqcc4cLhUH41mx0L97Q5/96Y2/oMMbbXmLSLgVFLE70ejwB3LLJ3J5k5ONMdf4ek5Mji EP08kaW3uIqHHh+29paWkVSdT7Ysb3lzSHvN99GiKf5JK/e/n89/1N9LfJR08MVHfg2y kpVSUl5yTGtHYiZ7ZAjqYDzfx7Xpq9On6hn0L2+/h61jgwotv/huUxIT9Qa9XnAbEoRM oexx8D1pPQVqNdpJgWJhOsPYrv9k79wKZxIvu/MC642lFG4lkCA07QoQTaAebzGWvPYD H5gg== X-Gm-Message-State: AHPjjUi+hrJmOt9sp1s6qMk50jyYER53tGcYfxDqSzXQWnZpJlrAqMp4 sH23WGygnjsgutkZJVr+HHU= X-Google-Smtp-Source: AOwi7QDFXZ2439vcnJ9WZk60CMGePez6f78La2iR4Krkm3RiBPhfLQixSRAI1TuDZVIWwbTE7PvC5A== X-Received: by 10.99.142.196 with SMTP id k187mr3828125pge.14.1505947624634; Wed, 20 Sep 2017 15:47:04 -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.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Sep 2017 15:47:04 -0700 (PDT) From: Eric Biggers <ebiggers3@gmail.com> To: linux-fscrypt@vger.kernel.org Subject: [PATCH 12/25] ext4: switch to fscrypt_prepare_link() Date: Wed, 20 Sep 2017 15:45:52 -0700 Message-Id: <20170920224605.22030-13-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_234726_377467_1FF909D1 X-CRM114-Status: GOOD ( 10.88 ) X-Spam-Score: -1.8 (-) X-Spam-Report: SpamAssassin version 3.4.1 on casper.infradead.org summary: Content analysis details: (-1.8 points, 5.0 required) 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:243 listed in] [list.dnswl.org] -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_AU Message has a valid DKIM or DK signature from author's domain 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 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/ext4/namei.c b/fs/ext4/namei.c index c1cf020d1889..b2058500f1dc 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -3221,9 +3221,10 @@ static int ext4_link(struct dentry *old_dentry, if (inode->i_nlink >= EXT4_LINK_MAX) return -EMLINK; - if (ext4_encrypted_inode(dir) && - !fscrypt_has_permitted_context(dir, inode)) - return -EPERM; + + err = fscrypt_prepare_link(old_dentry, dir, dentry); + if (err) + return err; if ((ext4_test_inode_flag(dir, EXT4_INODE_PROJINHERIT)) && (!projid_eq(EXT4_I(dir)->i_projid,