From patchwork Tue Oct 1 16:49:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Massimiliano Pellizzer X-Patchwork-Id: 1991643 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XJ3pD0mcfz1xtg for ; Wed, 2 Oct 2024 02:50:12 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1svg4a-00043P-AG; Tue, 01 Oct 2024 16:50:04 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1svg4Y-00042P-Jo for kernel-team@lists.ubuntu.com; Tue, 01 Oct 2024 16:50:02 +0000 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 3CF863F5E1 for ; Tue, 1 Oct 2024 16:50:02 +0000 (UTC) Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-42ca8037d9aso37970465e9.3 for ; Tue, 01 Oct 2024 09:50:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727801401; x=1728406201; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KXYapcZd6++eXccZkKpCZzNirnbglFgrZTHIvNVhxts=; b=fiks+vukMiLF6Y7vHnBpL4YiE+xp8uSRtnTg+3Pnxz3yD2MdwopmIeHK4a6uZKP+ut pk1+3wOw6VMT3kqL+OOkgtjS/zVw/6QobcMYc/tt5m7oxJ1QAYdQxd63YT7frxcpf+NP +ODIZtVQWXxFcW1tuPfhTyHP/Wy+1BssmSOGYGo3iyJdRBKV6AD3Bs8ZhRcjdtLWHJM4 nKHQr/del7lvVd0VscnbckE6YDzqRHlRhz64KY1/gqAACFA/GmSEczlA3YH1ehS1p7YJ /m7abc1KOSqZ01ZTAl28HAvaA/RAmpv0Q7CM/c17v9fVDK2J9sAS4CcHa1nQXw4UJaMt NZbg== X-Gm-Message-State: AOJu0YwDmnzwdB3Z4sArUQFfirfrvTnJK6dLgW2ZXUyWGgXu60Hy/dOB +etBFCxaQ6Yi742DcxalOAZQX6JYjl3re2zDqmSEXSfKZqz3UlXaj4eQ74jV2C8fnR+b+5nYuH3 s3gHomBy8ABP61OKTsrLtcBSgrZrcxbqGWVaNw5ny5gPgWKSJc8nB79cHUaHsi6vyHykkl/ikLV 6t4mD3K5X5BQ== X-Received: by 2002:a05:600c:1897:b0:42c:b2fa:1c15 with SMTP id 5b1f17b1804b1-42f77d2fbdemr339875e9.15.1727801401288; Tue, 01 Oct 2024 09:50:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEPq0odrpQx3H+5OYmVwSgTc8kX5Lsw2QPeyV+ZWb+jdU6IPWpbHYHIgR0cqsM9TMdp7hMDUA== X-Received: by 2002:a05:600c:1897:b0:42c:b2fa:1c15 with SMTP id 5b1f17b1804b1-42f77d2fbdemr339645e9.15.1727801400752; Tue, 01 Oct 2024 09:50:00 -0700 (PDT) Received: from framework-canonical.station (net-93-71-67-9.cust.vodafonedsl.it. [93.71.67.9]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f57dec169sm138504195e9.21.2024.10.01.09.49.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Oct 2024 09:49:59 -0700 (PDT) From: Massimiliano Pellizzer To: kernel-team@lists.ubuntu.com Subject: [SRU][F][PATCH 2/2] f2fs: fix to do sanity check on F2FS_INLINE_DATA flag in inode during GC Date: Tue, 1 Oct 2024 18:49:49 +0200 Message-ID: <20241001164952.58114-3-massimiliano.pellizzer@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241001164952.58114-1-massimiliano.pellizzer@canonical.com> References: <20241001164952.58114-1-massimiliano.pellizzer@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Chao Yu [ Upstream commit fc01008c92f40015aeeced94750855a7111b6929 ] syzbot reports a f2fs bug as below: ------------[ cut here ]------------ kernel BUG at fs/f2fs/inline.c:258! CPU: 1 PID: 34 Comm: kworker/u8:2 Not tainted 6.9.0-rc6-syzkaller-00012-g9e4bc4bcae01 #0 RIP: 0010:f2fs_write_inline_data+0x781/0x790 fs/f2fs/inline.c:258 Call Trace: f2fs_write_single_data_page+0xb65/0x1d60 fs/f2fs/data.c:2834 f2fs_write_cache_pages fs/f2fs/data.c:3133 [inline] __f2fs_write_data_pages fs/f2fs/data.c:3288 [inline] f2fs_write_data_pages+0x1efe/0x3a90 fs/f2fs/data.c:3315 do_writepages+0x35b/0x870 mm/page-writeback.c:2612 __writeback_single_inode+0x165/0x10b0 fs/fs-writeback.c:1650 writeback_sb_inodes+0x905/0x1260 fs/fs-writeback.c:1941 wb_writeback+0x457/0xce0 fs/fs-writeback.c:2117 wb_do_writeback fs/fs-writeback.c:2264 [inline] wb_workfn+0x410/0x1090 fs/fs-writeback.c:2304 process_one_work kernel/workqueue.c:3254 [inline] process_scheduled_works+0xa12/0x17c0 kernel/workqueue.c:3335 worker_thread+0x86d/0xd70 kernel/workqueue.c:3416 kthread+0x2f2/0x390 kernel/kthread.c:388 ret_from_fork+0x4d/0x80 arch/x86/kernel/process.c:147 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244 The root cause is: inline_data inode can be fuzzed, so that there may be valid blkaddr in its direct node, once f2fs triggers background GC to migrate the block, it will hit f2fs_bug_on() during dirty page writeback. Let's add sanity check on F2FS_INLINE_DATA flag in inode during GC, so that, it can forbid migrating inline_data inode's data block for fixing. Reported-by: syzbot+848062ba19c8782ca5c8@syzkaller.appspotmail.com Closes: https://lore.kernel.org/linux-f2fs-devel/000000000000d103ce06174d7ec3@google.com Signed-off-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin (backported from commit ae00e6536a2dd54b64b39e9a39548870cf835745 linux-6.6.y) [mpellizzer: backported solving merge conflicts which do not affect the fix] CVE-2024-44942 Signed-off-by: Massimiliano Pellizzer --- fs/f2fs/gc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c index d26b3fe38bd9..96dc497636c1 100644 --- a/fs/f2fs/gc.c +++ b/fs/f2fs/gc.c @@ -1073,6 +1073,16 @@ static int gc_data_segment(struct f2fs_sb_info *sbi, struct f2fs_summary *sum, special_file(inode->i_mode)) continue; + if (f2fs_has_inline_data(inode)) { + iput(inode); + set_sbi_flag(sbi, SBI_NEED_FSCK); + f2fs_err_ratelimited(sbi, + "inode %lx has both inline_data flag and " + "data block, nid=%u, ofs_in_node=%u", + inode->i_ino, dni.nid, ofs_in_node); + continue; + } + if (!down_write_trylock( &F2FS_I(inode)->i_gc_rwsem[WRITE])) { iput(inode);