From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 234D420E029; Sun, 7 Sep 2025 20:23:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757276620; cv=none; b=slpF9/HxpYX9XQ5kdClBf/rJptMEB4su4kw2o2yNUkd/VyhyAuP18Ac+WqHgBj/RA/Mkoq4GJXSnn6TOZu+l5jzas7MG3UtXAmCLMmoGSJZh09nbk2vgKSewg/KUqK+WS97gu9bBqIZaOzZY0XJMnJRaT+XJMLByiNAQbo9zCu0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757276620; c=relaxed/simple; bh=5LpCb30qiBEjsmQRT6B9ZBh8cfgmBUXwU9K/UrKInEo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gYaZAUGtmMdPKwPwefmPdZoI023WhVYPVidp90Dan2yLxBzGzxwuqtMBe5VdeW0A3AlkRCnWlcWEKHoAeIHVjf5iAO9+p15Y4L1FVMH6f8Av0eI+T2O200avCo9lAaD6l1QmqWvjr3bvWM+aoMOwPCYiNN6Ar9PDRlBqO093VLU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=UpkssgDX; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="UpkssgDX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6F1E4C4CEF0; Sun, 7 Sep 2025 20:23:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1757276620; bh=5LpCb30qiBEjsmQRT6B9ZBh8cfgmBUXwU9K/UrKInEo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UpkssgDXSr6nIg1COWl2HroJE2RZjffPzXsEZiLfF7rfKeqLl8tHfwcBQW82tNLWg YopBXaKhNnyGDdXKCHTGXf9/NdcBTg6IbOOcgCBwZKfwjs//1HEsV0l+ebgK7RhuPF wj3Rhwd/tHzvoqmlgjjpHYidl1PUyFvIP0D2KN60= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Edward Adam Davis , syzbot+47d8cb2f2cc1517e515a@syzkaller.appspotmail.com, Mark Tinguely , Joseph Qi , Mark Fasheh , Joel Becker , Junxiao Bi , Changwei Ge , Jun Piao , Andrew Morton Subject: [PATCH 6.6 058/121] ocfs2: prevent release journal inode after journal shutdown Date: Sun, 7 Sep 2025 21:58:14 +0200 Message-ID: <20250907195611.325885296@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250907195609.817339617@linuxfoundation.org> References: <20250907195609.817339617@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Edward Adam Davis commit f46e8ef8bb7b452584f2e75337b619ac51a7cadf upstream. Before calling ocfs2_delete_osb(), ocfs2_journal_shutdown() has already been executed in ocfs2_dismount_volume(), so osb->journal must be NULL. Therefore, the following calltrace will inevitably fail when it reaches jbd2_journal_release_jbd_inode(). ocfs2_dismount_volume()-> ocfs2_delete_osb()-> ocfs2_free_slot_info()-> __ocfs2_free_slot_info()-> evict()-> ocfs2_evict_inode()-> ocfs2_clear_inode()-> jbd2_journal_release_jbd_inode(osb->journal->j_journal, Adding osb->journal checks will prevent null-ptr-deref during the above execution path. Link: https://lkml.kernel.org/r/tencent_357489BEAEE4AED74CBD67D246DBD2C4C606@qq.com Fixes: da5e7c87827e ("ocfs2: cleanup journal init and shutdown") Signed-off-by: Edward Adam Davis Reported-by: syzbot+47d8cb2f2cc1517e515a@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=47d8cb2f2cc1517e515a Tested-by: syzbot+47d8cb2f2cc1517e515a@syzkaller.appspotmail.com Reviewed-by: Mark Tinguely Reviewed-by: Joseph Qi Cc: Mark Fasheh Cc: Joel Becker Cc: Junxiao Bi Cc: Changwei Ge Cc: Jun Piao Cc: Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- fs/ocfs2/inode.c | 3 +++ 1 file changed, 3 insertions(+) --- a/fs/ocfs2/inode.c +++ b/fs/ocfs2/inode.c @@ -1205,6 +1205,9 @@ static void ocfs2_clear_inode(struct ino * the journal is flushed before journal shutdown. Thus it is safe to * have inodes get cleaned up after journal shutdown. */ + if (!osb->journal) + return; + jbd2_journal_release_jbd_inode(osb->journal->j_journal, &oi->ip_jinode); }