From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E2BA033BBAF for ; Tue, 4 Aug 2026 17:18:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785863901; cv=none; b=O+eT+qwr7OmipSF2rs3q2RHKqW8Mcnmlu8U1QFkPK8MVi2WT6VmjoPd0tTJSfoFeMlnP52N4C66Cm0T+VMdZiEzGdfZZaydN2yS6U/5Nvtbv6Q3McoMLqMolcNUo5838gYwiQSVXF9n2d6Z46ppxMmxxLm8mMMayuDF09pxUX/g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785863901; c=relaxed/simple; bh=XySkVXaZ6qUhcQkqHCRJK57w6246cnBmTaN0fRWpzBU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=qQWzaA4wnB9qYq1kPT62en8g1z/d3XIw3Um167aud2M/TpPq+j/tnR17oCGNAuQMnxZGQWnSnrkCTW/xvJ2sltLr8udtY0de5nh5igEROFPkcRuxHiDmAZerx7d4w9/j8abMeh8+woIZxgpnztna93d5KP0DEh1ZiVbKMv0vAa4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=AjESSovC; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AjESSovC" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2cc73e322dbso1284495ad.1 for ; Tue, 04 Aug 2026 10:18:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785863889; x=1786468689; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=qYjqkukOCUBBX3l/sXn/dfJXEIcw36wAKJIGPbMHdOc=; b=AjESSovCPi7yN4iWY10D62XgpWMfBYnZp00VJ3KsFZs1xiV1oddzkOm+MpU7H/BjNh QgJi8AB/aThjyzm90wNuMPgqOR+ewQ+mjke4o9T+v+9DfwIirkb1U/k6/8f16EN5H2hg vAep7NjU+Kge07OKgiYD8QVDwQUdluLMjhlz7jS2OlJZk+7/VIPYUJMtllwzFnl1RxKN EOyjidaOFsC+3wslGtGSddiCSYvKG2Rr3hhlfp9PWQsNC8gn7sW3lRFQsDYPgAmsxByj fhft7wjo7nWdKZunj8wVGuy5sai3NdsX4Jd/3uW7Bm6AxD1Kkm4UjjUybzpvu/vgJQhJ sdfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785863889; x=1786468689; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=qYjqkukOCUBBX3l/sXn/dfJXEIcw36wAKJIGPbMHdOc=; b=OxcwD2//MRzo7EhAf3Wdnmjel30kbTkKYMvkmKH7j1N8Y0fmLpSrYzAoYsWVWZYTdu GWiXDGJzvcl4qYAoSD+NkXLgtV1Fo5Y0AUpwADjWdFVUqZ5nvB9yreO4q1obI6h3gfMT /Eip6d3FW8D3sJ8LU5xEWEuc1LOSWGhXi7aTt9UlFMiIw2FrOLJBWazPEyby99Vx/tlm jacS7omlBFabmrc+eRNOO3+6YtJwt6nV80pN3QdZRFDrWrN8LZKrnmUCE/tS6pEU9S8k ob/RJ9j00AjP0Q+iyesAImII8X0bgHZTi/mx8gX6smA/Y7HE3Z4D/SXutMtdgktAyjT3 VgSQ== X-Gm-Message-State: AOJu0YzBslaC0YFbyZXf0vQPrDTvbYzVc8B1NqYtZuEkd7n62GK2u9V8 Oi0GXcZnGx0B5ROEIvzfMU6L5Qy49nWKTN+jGkHGYvQY6I0mRhZ9tnHouztrHg== X-Gm-Gg: AR+sD12bYgNLCXXvZPb6xkxhUnYsJSCxsFAYIiJ0Tef7NWyRM/dwKMI5k0Myuxtei6V tWgpoBnZbHLWRcn6PYH+HpWj+ObBbHmrw+q4IF52RyFk6W2XXqiTvGlIGRoHZsw6J4j2cSwOxIC IW/Wpk1IndY63Kbk0X+sx7WDvWXDinBwPYbUrlUByp+SpaONZvI6QZU88gpmVjJ4we61J4U8nxa JFZoMwBNrpMvzuxV35nRm+tTlFB22HTwTgHbCoqox7VdtX+UX1G5uIUtAJpwjs/V1rzWt6d7eOt /AhD0fhFPhQ4TpTiltAaWYcaChfkEQgm9GlIhMnkvmx0AU9zDCgh/QjddkBjLsTj/MQtjWVwsZ3 AtJvndn6OcmbXSyRKvWll/CFaTcDSAux6EZ6SD3jSNJuqz7hrGOMgbSu1cZVscmkWkz6Q6PocDa usHGBgof/Dv5Cny+57nFlZYZBlsJR/F3QDr6/FwZQ7AmWWh/KkdWHaQp2xnu5ZUr7BtO9/33yIG NVe9lwXihdMVtE1ySAYkBlXig9BsVbERAMCDljMsBadiW1pBllH1cDTDlRp6suwjXplgQoDqabr D9utk9g8llQ8a9Udz7ck1Ig= X-Received: by 2002:a17:903:2ac5:b0:2c9:b8b7:5d27 with SMTP id d9443c01a7336-2d0ca712d8fmr4095955ad.1.1785863888716; Tue, 04 Aug 2026 10:18:08 -0700 (PDT) Received: from daehojeong-desktop.mtv.corp.google.com ([2a00:79e0:2e7c:8:a145:23df:65c7:83db]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-315863b0c61sm7035841eec.6.2026.08.04.10.18.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Aug 2026 10:18:07 -0700 (PDT) From: Daeho Jeong To: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, kernel-team@android.com Cc: Daeho Jeong Subject: [PATCH v3] fsck.f2fs: sanitize invalid segment type during block update Date: Tue, 4 Aug 2026 10:18:03 -0700 Message-ID: <20260804171804.28860-1-daeho43@gmail.com> X-Mailer: git-send-email 2.55.0.571.g244d577d93-goog Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Daeho Jeong If an invalid segment type (type < 0 || type >= NO_CHECK_TYPE) is read from SIT during block update, update_block() now validates the type, reports corruption via ASSERT_MSG(), fixes se->type directly, and falls back to a valid active curseg type based on its SSA summary block type when fix_on is enabled. find_next_free_block() also validates want_type to prevent out-of-bounds accesses. Signed-off-by: Daeho Jeong --- v3: do not update se->orig_type. v2: used ASSERT_MSG() instead of ERR_MSG(). used the correct type info for fixed_type. fixed se->type on top of fixing the local type only. --- fsck/mount.c | 5 +++++ fsck/segment.c | 20 ++++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/fsck/mount.c b/fsck/mount.c index 6f640a0..1804403 100644 --- a/fsck/mount.c +++ b/fsck/mount.c @@ -3059,6 +3059,11 @@ int find_next_free_block(struct f2fs_sb_info *sbi, u64 *to, int left, u64 end_blkaddr = (get_sb(segment_count_main) << get_sb(log_blocks_per_seg)) + get_sb(main_blkaddr); + if (want_type < 0 || want_type >= NO_CHECK_TYPE) { + ASSERT_MSG("Invalid segment type %d for block allocation", want_type); + return -EINVAL; + } + if (c.zoned_model == F2FS_ZONED_HM && !new_sec) { struct curseg_info *curseg = CURSEG_I(sbi, want_type); unsigned int segs_per_zone = sbi->segs_per_sec * sbi->secs_per_zone; diff --git a/fsck/segment.c b/fsck/segment.c index 96de22a..9f3fa0c 100644 --- a/fsck/segment.c +++ b/fsck/segment.c @@ -770,15 +770,32 @@ int update_block(struct f2fs_sb_info *sbi, void *buf, u32 *blkaddr, struct seg_entry *se; struct f2fs_summary sum; u64 new_blkaddr, old_blkaddr = *blkaddr, offset; - int ret, type; + int ret, type, sum_type; if (c.zoned_model != F2FS_ZONED_HM) return dev_write_block(buf, old_blkaddr, WRITE_LIFE_NONE); + sum_type = get_sum_entry(sbi, old_blkaddr, &sum); + /* update sit bitmap & valid_blocks && se->type for old block*/ se = get_seg_entry(sbi, GET_SEGNO(sbi, old_blkaddr)); offset = OFFSET_IN_SEG(sbi, old_blkaddr); type = se->type; + if (type < 0 || type >= NO_CHECK_TYPE) { + int fixed_type = (sum_type == SEG_TYPE_NODE || + sum_type == SEG_TYPE_CUR_NODE) ? + CURSEG_HOT_NODE : CURSEG_HOT_DATA; + + ASSERT_MSG("Invalid SIT segment type %d at blkaddr 0x%"PRIx64, + type, old_blkaddr); + + if (!c.fix_on) + return -EINVAL; + + FIX_MSG("Correct invalid segment type %d -> %d for blkaddr 0x%"PRIx64"\n", + type, fixed_type, old_blkaddr); + se->type = type = fixed_type; + } se->valid_blocks--; f2fs_clear_bit(offset, (char *)se->cur_valid_map); if (need_fsync_data_record(sbi)) @@ -811,7 +828,6 @@ int update_block(struct f2fs_sb_info *sbi, void *buf, u32 *blkaddr, f2fs_set_sit_bitmap(sbi, new_blkaddr); /* update SSA */ - get_sum_entry(sbi, old_blkaddr, &sum); update_sum_entry(sbi, new_blkaddr, &sum); if (IS_DATASEG(type)) { -- 2.55.0.571.g244d577d93-goog