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 AF3FE1AB6CC; Mon, 14 Oct 2024 15:21:45 +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=1728919305; cv=none; b=G6zynrInxSO46UwE84JASbACYTRS5jWba3Hh6m2uRXGHncBzIj9RWj/LxP6mzj9dJcn1WNMsU3dZ0w2EmcNkNWzYKo9s5VfhyAsg/kGn1IV8Vo9MHlHhoMG/vsDDA+OoXxoxru3FEaUfrrnZoBYdK4zsgnGGUIuTlFE7Lhk7xd8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728919305; c=relaxed/simple; bh=FBHv+rR7tl6s6CbEm0cy0dnQV5d2XoGTJhMUYrie6K8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Wg+QG9plqrAMpy44KYGiHE3Syf2OMby9l18L0uYDsx/s5yh7VOl8oY2aXzcc1krm+DWbpOigr9Sy6hmyzwjTBtUTaZxt53N4BJlEGbFva+jG64+3SKRq70OVBmOPKMt4T5vvd8vfGPfsvpG11KvoRldzIOmz8gOclOu3BNHr6Jg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=yqZLIWLQ; 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="yqZLIWLQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B2D71C4CEC3; Mon, 14 Oct 2024 15:21:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728919305; bh=FBHv+rR7tl6s6CbEm0cy0dnQV5d2XoGTJhMUYrie6K8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yqZLIWLQQTkU5d5yEnO8GhEf6MWpHx9p5xwOQikMVFAJk01SYvetrmxbAefYjx0Q4 NYxSw5V2v5ueUnSsDVGiWh9tnxJFLiFBDX1R07097hj0yfOZds0Q5zOZw0ew5CHQ05 nmIuhDrwnZstuZkWhKjgI9TqcwHZZuZjSTzwdS6k= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Lizhi Xu , Joseph Qi , Heming Zhao , Changwei Ge , Gang He , Joel Becker , Jun Piao , Junxiao Bi , Mark Fasheh , Andrew Morton Subject: [PATCH 6.1 572/798] ocfs2: fix possible null-ptr-deref in ocfs2_set_buffer_uptodate Date: Mon, 14 Oct 2024 16:18:46 +0200 Message-ID: <20241014141240.473496621@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241014141217.941104064@linuxfoundation.org> References: <20241014141217.941104064@linuxfoundation.org> User-Agent: quilt/0.67 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.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lizhi Xu commit 33b525cef4cff49e216e4133cc48452e11c0391e upstream. When doing cleanup, if flags without OCFS2_BH_READAHEAD, it may trigger NULL pointer dereference in the following ocfs2_set_buffer_uptodate() if bh is NULL. Link: https://lkml.kernel.org/r/20240902023636.1843422-3-joseph.qi@linux.alibaba.com Fixes: cf76c78595ca ("ocfs2: don't put and assigning null to bh allocated outside") Signed-off-by: Lizhi Xu Signed-off-by: Joseph Qi Reviewed-by: Joseph Qi Reported-by: Heming Zhao Suggested-by: Heming Zhao Cc: [4.20+] Cc: Changwei Ge Cc: Gang He Cc: Joel Becker Cc: Jun Piao Cc: Junxiao Bi Cc: Mark Fasheh Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- fs/ocfs2/buffer_head_io.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/fs/ocfs2/buffer_head_io.c +++ b/fs/ocfs2/buffer_head_io.c @@ -388,7 +388,8 @@ read_failure: /* Always set the buffer in the cache, even if it was * a forced read, or read-ahead which hasn't yet * completed. */ - ocfs2_set_buffer_uptodate(ci, bh); + if (bh) + ocfs2_set_buffer_uptodate(ci, bh); } ocfs2_metadata_cache_io_unlock(ci);