From patchwork Wed Sep 20 22:45:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 816599 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="Su4AnrJI"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="NNb4ykAc"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Tq8AbgOE"; 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 3xyFww4tm6z9sNr for ; Thu, 21 Sep 2017 09:16:16 +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=quXsP9MloM2wIIJYtoU49i9LNbaRY6n/qYDZ1pGQHuE=; b=Su4AnrJIiS3aACvImOpGwdXO4b huxgUsA6Y3klOZQg3cuOtb3yAm8wvMupli0d7CV/WoSSvG4aJ7lS3Z2BEoAbj5IMM0vAyt5uFD1st 2ZDHbqjBuznwmBZg5d+lziuy32DktIFokTsCUAOidb0pmMOaZ/UauPRZ4X66WmtUIX5hdzLJo6MHD jkEKPvMLPHf3PJKQTzHARbXGzcxqGJPGxzTywKcYgfuFc82oMb9R5Q3x9xixB6ZNP8DGpdQAaWuPA Utvqe3MnLVdKFPBl3mgFLwirFdUKAHZczJKaugX85svPHUVleY0QHCTAomaYCqBh49LZzvp6s/Vx4 c5xubjog==; 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 1duoDw-0002q5-Bp; Wed, 20 Sep 2017 23:16:08 +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-0006fH-0a 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=IggHwABRZFA4QcnHeUfeWTo3vHu5MJz9hAOmovqjsmc=; b=NNb4ykAc9PYKguOn+At5ReYbp AgYvS7zWdTYSpAvddYZVJcY8Du3AmxsysD4y0D7usbMYeTKfOKgao+aekv1X2pVPqJCXffOFIhvhB xt0/92mRWCPhI+OfUc3S471LjpqWZvG4LsXKMVtRM976KZ1eOIf3CDNtl1btKnLkHe3OPxEMBt1rw mfZts8OMoxuIPJv4rTI+aB/iXgd/Jd5i8DaWXgzE1zjGXq7DvuwSgKqlMGHzVtd2/aBmi/lEaI/k1 S8/Ni7GNdCdAq2fVImqCrKuu3WbFgjfOkEnQZRGaenqWcmjX7clWSTCM28CGs0RAaz6bzLL5yS4zP Rb5ws1NOA==; 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-0004sv-63 for linux-mtd@lists.infradead.org; Wed, 20 Sep 2017 22:47:27 +0000 Received: by mail-pg0-x243.google.com with SMTP id v5so2365456pgn.4 for ; Wed, 20 Sep 2017 15:47:09 -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=IggHwABRZFA4QcnHeUfeWTo3vHu5MJz9hAOmovqjsmc=; b=Tq8AbgOEcuQEvMA6z0iwMbYdEHQN/t+LyWxtSU7IOzucc6wdbMEM16rBAJFXH5U2xm aWQDoGBnKbgWDv5E+8Kw/36+vE8Lo0Qj3M2Pi6PKHqBRvjvWKj/Ho/eNpjOxJUEz9DFT KqSAHdGDphLcr/8+9iiLyVNOBN0b58V6sv7dogYy9WBpIxQgURmGm7CTMaEFvKYvKqps 0XuBqoLYrlo2F9nT6oYCLuD+c08obL9Qs57iV2Bh5I8B306mP31Q1P2GvZgi7Gl6l0Kq hgA6J9ckS8vVNjctg3ZYRE4OgQklAOnRXR9YSGx1X3/hvc25aQkJ8uFfMZW91lKVt8wL tDDQ== 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=IggHwABRZFA4QcnHeUfeWTo3vHu5MJz9hAOmovqjsmc=; b=hW/nOsbr24uFXVHjVnWOOE0Yd6iTzlhPDDuXXZQDlvoV4p/FTmCjVs+D/oGxNMrLsV TCxvXbGu95uBkNzMI1hbr7QO1TWFIEZVJHNeHWe5cxhV/fT9VKou45/eamSiVk/Pjz79 KNpinGIMB8AZbgjId6hHirxqwJwrWVfdt8JX99SfGFa1zSvR2NoNylF4OSJm1UH68YGc 8ejZooZAyWp+6V1iZ0xFTHkLUr8v0TKRtw6RV8SNcnfejLO2Tjxl7+9uaaio4HJ/p83S nOEhsmj+krU30fpk1BQAU4oaG6MgRxHAnE68nxH9//7T69HVYpMmyK6l8wLjTFfPjVzR q3kg== X-Gm-Message-State: AHPjjUh+ON83ak1S5CPWvpr3US8y9FXkYex1Nmn9s1XmmaCEGCefVeew bAfvsgkwdiPBSFfI5vo9/W0= X-Google-Smtp-Source: AOwi7QDu9zLe9MpV2DEY8V5dX957ETiMp/SmMH349YX3kQs/5nXlouGJ2Z29Awi0NhxQ+BmfuH9MJg== X-Received: by 10.84.216.87 with SMTP id f23mr3512435plj.307.1505947627777; Wed, 20 Sep 2017 15:47:07 -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.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Sep 2017 15:47:07 -0700 (PDT) From: Eric Biggers To: linux-fscrypt@vger.kernel.org Subject: [PATCH 15/25] ext4: switch to fscrypt_prepare_setattr() Date: Wed, 20 Sep 2017 15:45:55 -0700 Message-Id: <20170920224605.22030-16-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_375441_4E2BDD95 X-CRM114-Status: GOOD ( 10.96 ) 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 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/ext4/inode.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index d5a471939fbc..617c7feced24 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -5311,6 +5311,10 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr) if (error) return error; + error = fscrypt_prepare_setattr(dentry, attr); + if (error) + return error; + if (is_quota_modification(inode, attr)) { error = dquot_initialize(inode); if (error) @@ -5356,14 +5360,6 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr) loff_t oldsize = inode->i_size; int shrink = (attr->ia_size <= inode->i_size); - if (ext4_encrypted_inode(inode)) { - error = fscrypt_get_encryption_info(inode); - if (error) - return error; - if (!fscrypt_has_encryption_key(inode)) - return -ENOKEY; - } - if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) { struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);