From nobody Thu Apr 9 09:10:27 2026 Received: from mail-dy1-f173.google.com (mail-dy1-f173.google.com [74.125.82.173]) (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 05D6C33436A for ; Mon, 9 Mar 2026 23:08:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773097728; cv=none; b=LkaMEoaQol773GPMk+r1IFh0AlEonpWyNTWKNNIsAuKZXBFKmwCsSdUNVwsXZodHpNCmA2mjZiOzQdvnOex3XuUvR02HWofT5n6ZT/N5KVTWi6+WDB/Trs2Z43+c4kZ36gHqTmHastkhXtU8BLdS2O8eGNASIvcbHh/6CG5V8gw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773097728; c=relaxed/simple; bh=346Gvm9J1V16ckbmpxQAG0BjgBK8MVjVX4mLtT7RvQo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=ev41EcD5FRBftVpPG/c4/tvn13Yhxr1FzoLv5S7gSp4wucdvX2pdmUVs7nb2rnprWRDsFs/gkId4bqpf4pTjTAG9Q11etqzO+MHVd0f/l5vd0JYD9qsTeRkiMUX3LZF/8OXvuEHPltl3qa5g1SDo+NrZMluPV0UJ9YWANWU3V+c= 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=b5R54Qv1; arc=none smtp.client-ip=74.125.82.173 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="b5R54Qv1" Received: by mail-dy1-f173.google.com with SMTP id 5a478bee46e88-2be3bdfda8eso5576785eec.1 for ; Mon, 09 Mar 2026 16:08:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773097725; x=1773702525; 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; bh=NT60/qqiArXvkGxozfzhAVQf7Na3NTonflzMTGv8cyU=; b=b5R54Qv1TCqjMa01R95IhTLoBwaWR/Pvck56s7lAmuGhPxBD3bClzSXJvqE9t8jPI2 iwipstpKtjiAxG+SBU77bzlDPsaT2QbJgnFKfcNLrvrFpqxmmlYmTu1UgeeWx3T5IQ9s 3efGubkhtI8Z38OdsNqxW7pFzj4dtngpEg144kYyVaySltlPvCk9rlPaJyryjvh08AmF kVOwb11Mrf1A8CXDxcqeX72ZoUUcQTvHfz6CdNcPLaOb8u5K9obSK5ivCr6FhAV5s93W j3hvIsus6TkqM8CQgzxFJCuAPew3HuhWn/x8Oy3jJ9GAZpcEs/zx41EjEQW60YBz24oT svNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773097725; x=1773702525; 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; bh=NT60/qqiArXvkGxozfzhAVQf7Na3NTonflzMTGv8cyU=; b=ZCIr+scPjWFyPtOuWpjFpaXTBFblkRMmBipyVquU0CoMaE4C6DGPoiK5p8BAf/Jdhs fqNSPcujbzfClodtLXc/GqB1hjo5Q+trT2ghgib8W7VBNtHOSJvv/tDKI00BQaNDxMQ8 NwAdCayJ1drHAupDq2uHR5LvyVTXEzGVbrrfgKVx5uvc0EynSbdr1h22zgr6uCxwDYGY IhKrX24R8sUEs2s7AhwHr0M6XvPRUkcblXTBawvIvyDQrYV1o4zTvdAwy9hvNfjq/o4k AG/MRn8Ei86GKB6VH3UdGOBqpmgmrabtRqXDqJU34diettvIPQiDe5V+OgFIF1NG9Ks6 p6Cg== X-Forwarded-Encrypted: i=1; AJvYcCU3VZlP+XdTAuAlni0MkdMAWKoa3fKSe0wo8OjX4LnKdRd7NvxXmPZ4I1flVcb1he3M8s/0VduySLh7O1I=@vger.kernel.org X-Gm-Message-State: AOJu0YwyKgazrSaZ35ScE+eWZqHJyKzD8dJNhEr5OGPpwPpU+NuqBiUN dyJNr48XqcS3O1Afqf49K1hw2W0Tnf50G62bqBvacMz4aTaWnQG3WSGK X-Gm-Gg: ATEYQzw++EOtQDpWZKNEmD4ZGv9kLrJncLM53Ad8e0PsFwoWeuxM1YCl5xeB+ue9k36 sYy3ThfeLvje9XVlm+Zx2I+G3VBTZgxgh/r9HaRYcL0j/smIOcihTVF53QacftbdnPAFHeeb/yX uf4OqQoB0OsTP61GAMYYuzv+Tnwgn38PUHBTTIX+i65Ko3hXlNQjTEes9UebOQ2a+PMGviRgFxi u90U0vqEse7QZuTH+/ZiT06SKhdSAqnV6qQ1MZ6sbuYpvKt8QKJQdxRXNUsmCf/CRkRCACzL5ei TVCQot8kw7YkCAIf6LA5ZRQvkUJJ2jNK6QEZ7Q+Z4txv6IuJiIpUX6SiQdh5U1xAtxAWE2tPAg6 7CSpDKlGM6yxlIoQFdy2sq1c72cNjJ+Bh/pWBnJsS2aCUbXqH7EsvM7R/1p2diQKNmS5bhd6f5W aU+B4HGD/MXrAf9RV0dvQHBVoAKpi+8EazHZoY04lz62szDLBACWxKtgMM0GcIAg9hA1a8cUtMp n3TuMyiDEYDIP4lXUa4TNB02EcUf7ye6DZS0yrFZzDn3VxOJ8QyfRFY4RvvJanWXgpqbRgNnDOM 3n+3hljk6ZgVbNzWp1uqq9LiI/y/ X-Received: by 2002:a05:7301:3d1a:b0:2ba:66fd:3705 with SMTP id 5a478bee46e88-2be4de652f3mr5180803eec.1.1773097725064; Mon, 09 Mar 2026 16:08:45 -0700 (PDT) Received: from arch.lan (c-98-51-119-100.hsd1.ca.comcast.net. [98.51.119.100]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2be7d30fd82sm449116eec.21.2026.03.09.16.08.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 16:08:44 -0700 (PDT) From: Milos Nikic To: jack@suse.cz Cc: tytso@mit.edu, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, Milos Nikic Subject: [PATCH] jbd2: gracefully abort on checkpointing state corruptions Date: Mon, 9 Mar 2026 16:08:38 -0700 Message-ID: <20260309230838.422074-1-nikic.milos@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This patch targets two internal state machine invariants in checkpoint.c residing inside functions that natively return integer error codes. - In jbd2_cleanup_journal_tail(): A blocknr of 0 indicates a severely corrupted journal superblock. Replaced the J_ASSERT with a WARN_ON_ONCE and a graceful journal abort, returning -EUCLEAN. - In jbd2_log_do_checkpoint(): Replaced the J_ASSERT_BH checking for an unexpected buffer_jwrite state. If the warning triggers, we explicitly drop the just-taken get_bh() reference and call __flush_batch() to safely clean up any previously queued buffers in the j_chkpt_bhs array, preventing a memory leak before returning -EUCLEAN. Signed-off-by: Milos Nikic Reviewed-by: Andreas Dilger > Reviewed-by: Baokun Li Reviewed-by: Jan Kara Reviewed-by: Zhang Yi --- fs/jbd2/checkpoint.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c index de89c5bef607..cdfbfd27afae 100644 --- a/fs/jbd2/checkpoint.c +++ b/fs/jbd2/checkpoint.c @@ -267,7 +267,17 @@ int jbd2_log_do_checkpoint(journal_t *journal) */ BUFFER_TRACE(bh, "queue"); get_bh(bh); - J_ASSERT_BH(bh, !buffer_jwrite(bh)); + if (WARN_ON_ONCE(buffer_jwrite(bh))) { + put_bh(bh); /* drop the ref we just took */ + spin_unlock(&journal->j_list_lock); + jbd2_journal_abort(journal, -EUCLEAN); + + /* Clean up any previously batched buffers */ + if (batch_count) + __flush_batch(journal, &batch_count); + + return -EUCLEAN; + } journal->j_chkpt_bhs[batch_count++] =3D bh; transaction->t_chp_stats.cs_written++; transaction->t_checkpoint_list =3D jh->b_cpnext; @@ -325,7 +335,10 @@ int jbd2_cleanup_journal_tail(journal_t *journal) =20 if (!jbd2_journal_get_log_tail(journal, &first_tid, &blocknr)) return 1; - J_ASSERT(blocknr !=3D 0); + if (WARN_ON_ONCE(blocknr =3D=3D 0)) { + jbd2_journal_abort(journal, -EUCLEAN); + return -EUCLEAN; + } =20 /* * We need to make sure that any blocks that were recently written out --=20 2.53.0