From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.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 93183363C50 for ; Thu, 23 Jul 2026 20:02:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784836944; cv=none; b=UmyRTzOZzS8AUURGY+8SdGwHaW197KJK8BAxe8nJTTXaViA2IXYGAH6HjdqVIGLYvT+OVjSCU0D3JV1/PNqLaUKO4D/RGUNGoA4Fq8vAgkIQU72jAvTMciPvmaOu1QFpdoaZY5iIxr96nI1WljxfJvhT9QPeHjUVInVM4iQZHXE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784836944; c=relaxed/simple; bh=qqDR4cZyZJfcufxnXN+CD/IJM3Pxvbt9qMqkDwiEuxI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Fik9tzsUOftoT6MISw4+3+fX0oN8EFM5M6KIiQQSSC3HI5LGWdkU7Xi3RM28NutpTlMziZRWUhin9Q/vtVx/zxIkxZzVHekoDemCgLU3scHGnj0yl6azzsEpzT8Tt4aJrxRWhINWvnz/L+Jj6hu4Lvc6e74bVgt0E6IZKP/uVpo= 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=nYadsgcB; arc=none smtp.client-ip=209.85.210.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="nYadsgcB" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-8486672f03cso1112187b3a.0 for ; Thu, 23 Jul 2026 13:02:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784836943; x=1785441743; 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=9lc8plyt4D7Xg8g/OeFxLjXby4kcNIwZXjBiOq03DlA=; b=nYadsgcBqSpk2oCxLfIO55e/9bp8TLAXbBMV/f0ICDaQ6BsajZL1HeA12MO324HYT5 7pwq02KIFfav8mAkARoPuUiDTDSVkGPgmhUdSGlECdIh89yJBbi/IcRLKQBr4E73NrmC KQJX7Bbj474NfA4X1j0p5BAW3WgZQPIO12E3pUKvZbgN7jpTxquWRS/sS9NCZGj4372B VaVAW4DHNwv5T34xjgmFmxLcyJb8hMeOIXhprLHD1Px3K+dBQJhoRASsTv0xv/Za6Zh6 9qaih8G8xfAlkAh56PhNglLPEqMv4aNHwS74M/M6ThjE4F1klo9SRL+DPDmrlb7oHJL6 Wljw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784836943; x=1785441743; 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=9lc8plyt4D7Xg8g/OeFxLjXby4kcNIwZXjBiOq03DlA=; b=Ke/Y2eyiz4EqsIcLjDOg/6WvllJZ+EhqEvRrkTGEUOpGODvl22WXw6UkV6jCI2ZFTB B6TTFsEG2bDdMWmg8W0SvcUhMwFIcYpMnPSsmof+dDaIfkXmiRj4HuTpv0KH5sPoib1x 2QVadPPNjJ/sd2i0t79h7VX0rwSuHbmRktniANAZ/GLVbwxG7RVjxLT//Uu7lhyIkf+9 iGB1MvTb/CT7YuwD0UOf2wU0k0LtRLBEW0KxsgMbJkUeiPgftLbzWKMVMqpgUOYElXFU EsOflGz8n2d59esISD2EhBK5L73CVlBV+VDZqJ1oF/Rvae+itzHeRVHg8TYwV5BqsMNo CBuA== X-Gm-Message-State: AOJu0Yzs66OE1frbo9wAjE0tHg3nL1k7xx8+K5hW2AiHnv7xQHlfyDsU tUwGypFWiUmugORWYXYODrYrF023m9gsIUKrBoe8p5Ja5p51eqUe1IXiKlZ2NQ== X-Gm-Gg: AR+sD117z2W8xHrvNrHqFly4lbpAF3chfiGvARpDYjnm8BIllUM5CpFwU7xw1wxaEl7 FTTuhHu3br809BAcURxzhD+iAKdLOb2EbDI8kixWed8nvkP8FDsoHP3F+NUh08XO+BowcNaie1R C7bg+P51FiM81HQK0ijNlznbK8URE+czAx6tHV7gFliEKId44rNGcOvpXNDUo/M7vD3OKsS1yuC P+cevtmHJemJgo425zOLj/sEG3FEjstSGY22Vz+WnX6ixogHcas46Nilgg6aywF0yF52E6c1Oxf ukLI1Y3wBO6zHjyCSwob8JwTiMRQTDMNslnNINwRHoBwU6SvXQm9dVL/IxzBIoWc6ee7lLyLqae TtEyjpO87IqQQah0DlhA/b+uznS+QWOEEl8Kr/ds5znmdLIfdmF2/frS42G1q+kFcMhMfuJ6GDz ph/yRCdNf6oitcHa2sh+NlakUTa80jlklYZAMcBlLJNFTIpB/0OdfFGujtJ1QsdNl22qc0PTLQf OLXKn222fwy+OgQNdX8gRJuZopEWg== X-Received: by 2002:a05:6a21:6b0d:b0:3c3:a140:938a with SMTP id adf61e73a8af0-3c44b18de59mr5302478637.45.1784836942868; Thu, 23 Jul 2026 13:02:22 -0700 (PDT) Received: from daehojeong-desktop.mtv.corp.google.com ([2a00:79e0:2e7c:8:8f80:8150:b723:2d96]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3147dc6781dsm24471496eec.9.2026.07.23.13.02.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2026 13:02:21 -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] fsck.f2fs: sanitize invalid segment type during block update Date: Thu, 23 Jul 2026 13:02:18 -0700 Message-ID: <20260723200218.2528887-1-daeho43@gmail.com> X-Mailer: git-send-email 2.55.0.229.g6434b31f56-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, and falls back to a valid active curseg 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 --- fsck/mount.c | 5 +++++ fsck/segment.c | 14 ++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/fsck/mount.c b/fsck/mount.c index 85ed404..ce96a44 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) { + ERR_MSG("Invalid segment type %d for block allocation\n", 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 46dc747..1ae90bf 100644 --- a/fsck/segment.c +++ b/fsck/segment.c @@ -779,6 +779,20 @@ int update_block(struct f2fs_sb_info *sbi, void *buf, u32 *blkaddr, 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) { + MSG(0, "[FSCK] Invalid SIT segment type %d at blkaddr 0x%"PRIx64"\n", + type, old_blkaddr); + c.bug_on = 1; + + if (!c.fix_on) + return -EINVAL; + + int fixed_type = IS_NODESEG(type) ? CURSEG_HOT_NODE : CURSEG_HOT_DATA; + + FIX_MSG("Correct invalid segment type %d -> %d for blkaddr 0x%"PRIx64"\n", + type, fixed_type, old_blkaddr); + type = fixed_type; + } se->valid_blocks--; f2fs_clear_bit(offset, (char *)se->cur_valid_map); if (need_fsync_data_record(sbi)) -- 2.55.0.229.g6434b31f56-goog