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 8DE2EC54EEB for ; Sun, 22 Mar 2020 10:13:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5F73A20774 for ; Sun, 22 Mar 2020 10:13:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584872036; bh=qY9djTHVMcBmEzN9Ipo6IH5R9rBsmSjSqKMdxBMQC1o=; h=From:To:Cc:Subject:Date:List-ID:From; b=Up1zkQAlfJhKaIlFpzQIk4FPeWTJgc1Jsqp+a2zwHiAQCBtNW5HYHQy5ZtPmhJFiv F44EYG1xIfOeU/XuLSGVi5F4iCAGMhcrpTDyW+6ZfYsdTxkbZYjxk9G1yJV4mEeZFG BKglFDX8CeXAE1tanjWMfhuLyRjSv/BPQtAAutvI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726945AbgCVKNz (ORCPT ); Sun, 22 Mar 2020 06:13:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:48766 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726895AbgCVKNz (ORCPT ); Sun, 22 Mar 2020 06:13:55 -0400 Received: from localhost.localdomain (unknown [49.65.245.234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6C9D720714; Sun, 22 Mar 2020 10:13:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584872034; bh=qY9djTHVMcBmEzN9Ipo6IH5R9rBsmSjSqKMdxBMQC1o=; h=From:To:Cc:Subject:Date:From; b=JFQ3bapbhpAGomNejw8wBGvtc6TB+wY0L5rdIUygbi+6IrbM8Zxn6YJFQN0EZlXAF ofTHqNSDSTNpoRjToBKXCwqBLY9UWwufS+4ILZn7OVtDO2wgNDUq/4sXh46jDJxP7o 1QIezIEuI0pkM96ESAbsbpZaUDo0gvFWy+iFcgXc= 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 potential .flags overflow on 32bit architecture Date: Sun, 22 Mar 2020 18:13:27 +0800 Message-Id: <20200322101327.5979-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_inode_info.flags is unsigned long variable, it has 32 bits in 32bit architecture, since we introduced FI_MMAP_FILE flag when we support data compression, we may access memory cross the border of .flags field, corrupting .i_sem field, result in below deadlock. To fix this issue, let's introduce .extra_flags to grab extra space to store those new flags. Call Trace: __schedule+0x8d0/0x13fc ? mark_held_locks+0xac/0x100 schedule+0xcc/0x260 rwsem_down_write_slowpath+0x3ab/0x65d down_write+0xc7/0xe0 f2fs_drop_nlink+0x3d/0x600 [f2fs] f2fs_delete_inline_entry+0x300/0x440 [f2fs] f2fs_delete_entry+0x3a1/0x7f0 [f2fs] f2fs_unlink+0x500/0x790 [f2fs] vfs_unlink+0x211/0x490 do_unlinkat+0x483/0x520 sys_unlink+0x4a/0x70 do_fast_syscall_32+0x12b/0x683 entry_SYSENTER_32+0xaa/0x102 Fixes: 4c8ff7095bef ("f2fs: support data compression") Signed-off-by: Chao Yu --- fs/f2fs/f2fs.h | 26 ++++++++++++++++++++------ fs/f2fs/inode.c | 1 + 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index fcafa68212eb..fcd22df2e9ca 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -695,6 +695,7 @@ struct f2fs_inode_info { /* Use below internally in f2fs*/ unsigned long flags; /* use to pass per-file flags */ + unsigned long extra_flags; /* extra flags */ struct rw_semaphore i_sem; /* protect fi info */ atomic_t dirty_pages; /* # of dirty pages */ f2fs_hash_t chash; /* hash value of given file name */ @@ -2569,7 +2570,7 @@ enum { }; static inline void __mark_inode_dirty_flag(struct inode *inode, - int flag, bool set) + unsigned long long flag, bool set) { switch (flag) { case FI_INLINE_XATTR: @@ -2588,20 +2589,33 @@ static inline void __mark_inode_dirty_flag(struct inode *inode, static inline void set_inode_flag(struct inode *inode, int flag) { - if (!test_bit(flag, &F2FS_I(inode)->flags)) - set_bit(flag, &F2FS_I(inode)->flags); + if ((1 << flag) <= sizeof(unsigned long)) { + if (!test_bit(flag, &F2FS_I(inode)->flags)) + set_bit(flag, &F2FS_I(inode)->flags); + } else { + if (!test_bit(flag - 32, &F2FS_I(inode)->extra_flags)) + set_bit(flag - 32, &F2FS_I(inode)->extra_flags); + } __mark_inode_dirty_flag(inode, flag, true); } static inline int is_inode_flag_set(struct inode *inode, int flag) { - return test_bit(flag, &F2FS_I(inode)->flags); + if ((1 << flag) <= sizeof(unsigned long)) + return test_bit(flag, &F2FS_I(inode)->flags); + else + return test_bit(flag - 32, &F2FS_I(inode)->extra_flags); } static inline void clear_inode_flag(struct inode *inode, int flag) { - if (test_bit(flag, &F2FS_I(inode)->flags)) - clear_bit(flag, &F2FS_I(inode)->flags); + if ((1 << flag) <= sizeof(unsigned long)) { + if (test_bit(flag, &F2FS_I(inode)->flags)) + clear_bit(flag, &F2FS_I(inode)->flags); + } else { + if (test_bit(flag - 32, &F2FS_I(inode)->extra_flags)) + clear_bit(flag - 32, &F2FS_I(inode)->extra_flags); + } __mark_inode_dirty_flag(inode, flag, false); } diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c index 44e08bf2e2b4..ca924d7e0e30 100644 --- a/fs/f2fs/inode.c +++ b/fs/f2fs/inode.c @@ -363,6 +363,7 @@ static int do_read_inode(struct inode *inode) if (S_ISREG(inode->i_mode)) fi->i_flags &= ~F2FS_PROJINHERIT_FL; fi->flags = 0; + fi->extra_flags = 0; fi->i_advise = ri->i_advise; fi->i_pino = le32_to_cpu(ri->i_pino); fi->i_dir_level = ri->i_dir_level; -- 2.22.0