From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 E10AA424D65; Fri, 4 Sep 2026 06:15:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788502555; cv=none; b=ELvWaCHq2OTVrplG/sJfT+Qf/GJdS/dBmsytpn88nPuIZCtuGUelravEnKUcIzCgi+jUKL/hF/GAoGC9Nh/IHPu7qsJ/y3y9RwZB7mmmBuQqd6MhE4cYy0Nu9AscsKwptdx1WCZHDkcQFp8DT0g9WmV6VuD2PD6VGuSWzCjo+kg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788502555; c=relaxed/simple; bh=JjrjDn1P8T6uvH/XNBzgBqJMKAeGhT8agrPy/lMoLqQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=muwZGjGqmu/AcOCE0Aniz6FLXirgFpvGeWyOFhQPGxkrAUWixyFmgfK4xMh4HpsYufUqtsVoau3cYbVA3jMwnYXOyl/YQyTIEhPCi0deRFhVRM4I2GhFPIQfVm/EWGsbMgi4gulBQwe0G8qa5mDb6H2Zx6k2Ix8m0CyxtQ27AFo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Mwd9NpLV; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Mwd9NpLV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 047721F00A3E; Fri, 4 Sep 2026 06:15:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1788502553; bh=KrOCVsaj0BIfkUphUG+pAg8Rv2ZHTV+0w5kzEquweGc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Mwd9NpLV/AuHF8whIf0M+a6gvJrduFlHkgBNhEX+B+lAUv1Wcr5rvJ9j63/KHD+ak /bpY/0zO1azkoUGPHnV1jmbuTplRRkMxNBd73qo37GwW3ZBoS+ttP3yfqVPE4zJFVF s55hI7A/ajv4F8HxNU1T+7lYrwtAJaM7rWpBaJhA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Joseph Qi , Mark Fasheh , Joel Becker , Junxiao Bi , Changwei Ge , Jun Piao , Heming Zhao , Andrew Morton Subject: [PATCH 6.12 248/403] ocfs2: cluster: fix o2hb_dependent_users leak on pin failure Date: Fri, 4 Sep 2026 07:00:51 +0200 Message-ID: <20260904045740.509944467@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260904045734.806166532@linuxfoundation.org> References: <20260904045734.806166532@linuxfoundation.org> User-Agent: quilt/0.69 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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Joseph Qi commit 12c2ab42dbe227956c765e2674364bfca5de0533 upstream. In o2hb_region_inc_user(), o2hb_dependent_users is incremented unconditionally before calling o2hb_region_pin(). If the pin fails, the counter is never decremented and any partially-pinned regions are never unpinned, since the caller does not call o2hb_region_dec_user() on error. The leaked counter causes subsequent o2hb_region_inc_user() calls to skip pinning entirely (the > 1 check), leaving heartbeat regions unprotected. Fix by rolling back on failure: call o2hb_region_unpin(NULL) to release any partially-pinned regions and decrement o2hb_dependent_users to restore the pre-increment state. Link: https://lore.kernel.org/20260722124933.430554-4-joseph.qi@linux.alibaba.com Fixes: 58a3158a5d17 ("ocfs2/cluster: Pin/unpin o2hb regions") Signed-off-by: Joseph Qi Cc: Mark Fasheh Cc: Joel Becker Cc: Junxiao Bi Cc: Changwei Ge Cc: Jun Piao Cc: Heming Zhao Cc: Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- fs/ocfs2/cluster/heartbeat.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) --- a/fs/ocfs2/cluster/heartbeat.c +++ b/fs/ocfs2/cluster/heartbeat.c @@ -2442,8 +2442,13 @@ static int o2hb_region_inc_user(const ch goto unlock; if (bitmap_weight(o2hb_quorum_region_bitmap, - O2NM_MAX_REGIONS) <= O2HB_PIN_CUT_OFF) + O2NM_MAX_REGIONS) <= O2HB_PIN_CUT_OFF) { ret = o2hb_region_pin(NULL, false); + if (ret) { + o2hb_region_unpin(NULL); + o2hb_dependent_users--; + } + } unlock: spin_unlock(&o2hb_live_lock);