From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 686ABC3A589 for ; Tue, 20 Aug 2019 14:35:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3017E206DF for ; Tue, 20 Aug 2019 14:35:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566311726; bh=KZ3+f1X6H8F4tdCkHq5J6hMugLIxLtLvPMyf8pCWZmE=; h=From:To:Cc:Subject:Date:List-ID:From; b=F7SOT+E+Ddvhi8P/chRFVLM2gomfJgJy40lsqqQWyitpIUY8xBUhr2pNTIoxrqXnO B+05TxX/vuMyqEM38a7rJlqnXjX4m2j+/bfTpzaEWW6c1BLl5ZZUd4bq/oV/mdUXJZ e3QmxqPU82S2s5GRrhIxUgMQdgnrpTGTzU6c0iF8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730269AbfHTOfZ (ORCPT ); Tue, 20 Aug 2019 10:35:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:38928 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729812AbfHTOfY (ORCPT ); Tue, 20 Aug 2019 10:35:24 -0400 Received: from localhost.localdomain (unknown [180.111.132.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B0421214DA; Tue, 20 Aug 2019 14:35:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566311723; bh=KZ3+f1X6H8F4tdCkHq5J6hMugLIxLtLvPMyf8pCWZmE=; h=From:To:Cc:Subject:Date:From; b=lbMQfYwzX02ZUEfPxZ55RFYYjFcsyixNVlUY5BzWkjRyFeFFIuG1Wj8KYaU6Bh+Ey 6U04GCgMt+xEeNt61/UuAEfkx6nZWPxKva44w2TXBEkMDNy81Ou229IhCcBlII+hTF pi0FXkeQ9rna58o/2kEaCIwaoM2USVYrAG9O0PDY= From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH] f2fs: fix to avoid corruption during inline conversion Date: Tue, 20 Aug 2019 22:34:22 +0800 Message-Id: <20190820143422.3458-1-chao@kernel.org> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chao Yu - f2fs_setattr - truncate_setsize (expand i_size) - f2fs_convert_inline_inode - f2fs_convert_inline_page - f2fs_reserve_block - f2fs_get_node_info failed Once we fail in above path, inline flag will remain, however - we've reserved one block at inode.i_addr[0] - i_size has expanded Fix error path to avoid inode corruption. Signed-off-by: Chao Yu --- fs/f2fs/file.c | 8 ++++++-- fs/f2fs/inline.c | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 2284ec706a40..05d60082da3a 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -812,7 +812,8 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr) } if (attr->ia_valid & ATTR_SIZE) { - bool to_smaller = (attr->ia_size <= i_size_read(inode)); + loff_t old_size = i_size_read(inode); + bool to_smaller = (attr->ia_size <= old_size); down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); down_write(&F2FS_I(inode)->i_mmap_sem); @@ -835,8 +836,11 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr) /* should convert inline inode here */ if (!f2fs_may_inline_data(inode)) { err = f2fs_convert_inline_inode(inode); - if (err) + if (err) { + /* recover old i_size */ + i_size_write(inode, old_size); return err; + } } inode->i_mtime = inode->i_ctime = current_time(inode); } diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c index 78d6ebe165cd..16ebdd4d1f2c 100644 --- a/fs/f2fs/inline.c +++ b/fs/f2fs/inline.c @@ -131,6 +131,7 @@ int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page) err = f2fs_get_node_info(fio.sbi, dn->nid, &ni); if (err) { + f2fs_truncate_data_blocks_range(dn, 1); f2fs_put_dnode(dn); return err; } -- 2.22.0