From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f53.google.com (mail-dl1-f53.google.com [74.125.82.53]) (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 EF44F4D90A3 for ; Tue, 3 Mar 2026 18:02:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772560925; cv=none; b=u30UOKkRChZxUB5TeuY2I8n+NRAGIDVGP5Dkx5RUF4UlWmhsTCygj6Gc3jxACEno1otHTCZcv+mHOuTvJlThZDrnMobPjmx8dbHyfUSSeszHxW98x5QqRiTBpHCMEcksbMJKVONErwP7IF5WOilZnaA7481GSawlmwioi7L7YGM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772560925; c=relaxed/simple; bh=/IXmo69Qqppsb0Rguh1puUkOgy5dR4pABTlr/a1NR3o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Z632F9IakCiGqHslKb35QdwLpT5o6t3hy9x4NTUFMRVQXT6u9LUThUKOE7+0V6KrxoZwi/YG8PO9l5wdTrOMQ3N9TW42a21ZdZWxwCQbyZD7FrouAhhRvZEK4Zkkmweh78Y8hvF4EYma/bwStKE19EpB7gL/q86ID+tk8SAyKcM= 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=LFOFwRvB; arc=none smtp.client-ip=74.125.82.53 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="LFOFwRvB" Received: by mail-dl1-f53.google.com with SMTP id a92af1059eb24-12732165d1eso6440033c88.1 for ; Tue, 03 Mar 2026 10:02:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772560923; x=1773165723; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nYGdbxnOx3otBr6PvYVC6d9nFh0rDHzCPxy+MS19bo0=; b=LFOFwRvBxGNJHCcQtPfFkMFQB3KqM9Ww+dsksJf5cpVYxcHoawXjL4XINR/5aGSl2I yfwUbnpg8WqVlF5y5SPIDThtzFeZI4kCKnvXkPBXs4LPtBSWdJKTUNoIEBmLR9fBPJhO i0jtvhtstywHJeqY9xraoV+YtOSe4KCS/gJLkMen0q/WgU09A9BoS/UjpkmYixoiOg2s QX7RJlpQgfTil6AavMDkALf9otTMne6LkQgdq1laPbMOhFFPKFrkgot40PtL+cjD7Yj3 85Fvze2u+Z/MRysy9g6nzNo1YBFIaswzH22DnPO4Z+WUKgPb9kdMv7VOn8dJR1nnd8EB uONw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772560923; x=1773165723; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=nYGdbxnOx3otBr6PvYVC6d9nFh0rDHzCPxy+MS19bo0=; b=cSJV+pAamd/laR2Ry5zTmiV4iR4yJfBmQ/80XTvhl9cE/OlF2Wf5xj6vraNuepCG+2 WaDRqSOePIBcZGJ5ztP57D45sI9kg1hTjA24SLr+DMBZxmq+0LptpGZjE7USruO4Sr77 wVcv6UZ//fwe/11+u///o906lVQup9Vn+Flm7dRM/HqPup5fEV6ILQiWr/d1b4kTDpgI 6Gc1lRW7qpyO6g+hyk3f8GlknB4JZRQ6ttNBEbgTieVXiufp0CLfBJwI2NOKRW/pEzH7 EqzSnjFbTYB5qhZ7ptL1QpWleLEv/G+R9lwdqnjKR2NgjzRJ32I/QE8JjGGjEV2MVzJw LUhA== X-Forwarded-Encrypted: i=1; AJvYcCVzafpxTSFbtW3rmuEgSJ1NiB86Kw/980kuUVDyPoSxiWqee2S7LINlK5SklQMTN1JxdWf8gvmEv4Vn@vger.kernel.org X-Gm-Message-State: AOJu0YxCL1VU5lN/ISuYV8bx0h3s7CgA4nZWnag0py24NKk702dTk3bC LZlfCQg8H/niJdA+fV4z04S8N5DpaEavDMFp7GAd4cB/RXdNkjkcETlUktBoMw== X-Gm-Gg: ATEYQzwDcEyWLN0sy6FCN1y8IeAfTWNgiBAVFkFt5k+Z5fKGTTG+n5SlQdEH0BaAvW5 Buqloa0oZpgQOPkKfXUcXhXk37mYg3KtWQKKr+zdmxxjHsKEMBJHOWBwHTNleXtYUHbx5kH9mj0 WUQXSJHplrobS1yOc8MOB+ZhKQHxyuczkkMnaeZcNpBmYw5y+kj9IGX6NdGB7LV3USszt+2aRvZ 23Stxaoh1SSXoJ1ZGkJ8e9MCmWbgu8spBkUbZy4+2k76ahk/vkIollm4M8ELCP7DpzvVXIDvVah 1f/7SQhFJcQhnmXtjxeXudg7rm8VSE9RhE4RJuvUoAW5cYp/ncfzp+o8A/5ncIMy0HUFqCD/BiJ pIKhXu2aBrPv+U7ooJTBb/LJ9E4iBIDKvaMzofAwA7NuxTe2hlTVxRmPr9LuGYpzluZ0fS7cLNA cAImCKUSD585ro+OaRh+zHGL4XROhE6Cc89GYi3uwamlWC6ieCPTsb4iI/AMGlj3okZQBu++RLK 1kb76i6CPFDCEXPUCuRNudEOo4zmQl3TO1QCW1yp+Gy8HwlQ9e8/njKXZmYUNMA3J0g4RZPCP3C X-Received: by 2002:a05:7300:6ca8:b0:2be:aa:9a4a with SMTP id 5a478bee46e88-2be00aa9ba5mr3428751eec.0.1772560923094; Tue, 03 Mar 2026 10:02:03 -0800 (PST) Received: from arch.guest.box.net ([8.39.49.136]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2bdfba0df2fsm9506612eec.7.2026.03.03.10.02.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Mar 2026 10:02:02 -0800 (PST) From: Milos Nikic To: jack@suse.cz Cc: tytso@mit.edu, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, Milos Nikic , Zhang Yi , Andreas Dilger Subject: [PATCH v4 1/2] jbd2: gracefully abort instead of panicking on unlocked buffer Date: Tue, 3 Mar 2026 10:01:56 -0800 Message-ID: <20260303180157.53061-2-nikic.milos@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260303180157.53061-1-nikic.milos@gmail.com> References: <20260303180157.53061-1-nikic.milos@gmail.com> Precedence: bulk X-Mailing-List: linux-ext4@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In jbd2_journal_get_create_access(), if the caller passes an unlocked buffer, the code currently triggers a fatal J_ASSERT. While an unlocked buffer here is a clear API violation and a bug in the caller, crashing the entire system is an overly severe response. It brings down the whole machine for a localized filesystem inconsistency. Replace the J_ASSERT with a WARN_ON_ONCE to capture the offending caller's stack trace, and return an error (-EINVAL). This allows the journal to gracefully abort the transaction, protecting data integrity without causing a kernel panic. Signed-off-by: Milos Nikic Reviewed-by: Zhang Yi Reviewed-by: Jan Kara Reviewed-by: Andreas Dilger --- fs/jbd2/transaction.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index dca4b5d8aaaa..04d17a5f2a82 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c @@ -1302,7 +1302,12 @@ int jbd2_journal_get_create_access(handle_t *handle, struct buffer_head *bh) goto out; } - J_ASSERT_JH(jh, buffer_locked(jh2bh(jh))); + if (WARN_ON_ONCE(!buffer_locked(jh2bh(jh)))) { + err = -EINVAL; + spin_unlock(&jh->b_state_lock); + jbd2_journal_abort(journal, err); + goto out; + } if (jh->b_transaction == NULL) { /* -- 2.53.0