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 ECFD31DE4CC; Tue, 8 Oct 2024 13:00: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=1728392446; cv=none; b=cbVjzOk9UxxLPgGUN4tt+Dg66EnjXLyX76E25VF5Y+DyN0d9MrAUHxHszrcee0Ddq7VsZlOLI66f6liBz0LAxMwNylUQwF3uKjVc8ZlQrbI5ZXih+cgEeoRyldW/bH5CvKe+Al20zoe7iY8yTFf9GMJsa2PbFQbkqZNYvI4Anq8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728392446; c=relaxed/simple; bh=uRRZMslZ48idI8vdHrgMlEIIl7itmAk2ueG2uY/W2UQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FLHT12fez0If4PBxzVNAmB/mFZifj/DtpQXkVt3KW94a2on2R9WxtKqaCiaGvLIi7G4+ODLr7Mgys14rAW02FJ9ZQRcsT3zcj1gn2Y59b+PsL+FNm0O/f0hwcNRIlhwchbhrzIcaX6oq8A6SKICVj/urARj2bYWxxJuw7679Q+c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=FZ0MnNLX; 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="FZ0MnNLX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5D25DC4CEC7; Tue, 8 Oct 2024 13:00:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728392445; bh=uRRZMslZ48idI8vdHrgMlEIIl7itmAk2ueG2uY/W2UQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FZ0MnNLX2dNPxqM10HgAELW+iNy8SWdBp04lZWn/M61F3h9LE8iJlMaFEfO3tPeGF PppC8dnaBGujXsbQ142r6Q3yJkC++3EHuWD6JA+LSDWMXFYIlZ4cAQJlJk/Y8b1xjK fyMBvsDFL5/zGez2rRMIf5rQcQW8dCbR+K0ZlKgw= 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.11 418/558] ocfs2: fix possible null-ptr-deref in ocfs2_set_buffer_uptodate Date: Tue, 8 Oct 2024 14:07:28 +0200 Message-ID: <20241008115718.723166576@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241008115702.214071228@linuxfoundation.org> References: <20241008115702.214071228@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.11-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);