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 870C242586B; Sat, 12 Sep 2026 13:41:15 +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=1789220476; cv=none; b=JmssNvGLDQrOqmbOnApZpkZRCSzrbtr20Shq9zS1qvkwUnWtJp3CB6UVqez0602LZOoXWMI6tSd7N5lzU3Ed3CMbRVvmj4VBkdAkMogBwTCaVhyRye5Hmf5e4bivdY4q14hJosZFrk7HAVq3Fo2j/+kmrzukurvvSFk6p6+Edzk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789220476; c=relaxed/simple; bh=EY4TEsd/hY/RNn2gL6a0tT37R6VJAfppwiRBnkmTPUI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gPqXyQbZedaXUw7dwF+Wzl68x1K77FNi7XuZ6TyvJuZRB5rQ4Qr17z5H/eYkSg9GNupxUj1kqj6XffEDegPLl831LEdvXf2rgkpCmpHq+wAfg6dCr+evNFSalEGwHTeWf6WvYgfBPXTWWA8wJNUFKtzQQDmaVX2vC/fUcH9+EC4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=dbbLGT+K; 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="dbbLGT+K" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8C0511F000FF; Sat, 12 Sep 2026 13:41:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789220475; bh=N1SrQexP1lUQvEIvOCkqkhcttBsRHzDlC5l1C/y7fC0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dbbLGT+KYrLA4KH71DbMu/Z/T+xexHOADXqxlEl5Iw6VeBpDLOjKUzTkR2ncXSzPj St2IMo3C1D00fDIAc0wO3vyIcKMvfwhk2bO2NTS7JSVlkhTpX5cPd9SMN5FjLW+6Gh qt4cI4G9DIyax+w/l4mxVEMYaoUoLFDg9RnVm2uw= 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.6 0185/1424] ocfs2: cluster: fix o2hb_dependent_users leak on pin failure Date: Sat, 12 Sep 2026 08:43:37 +0200 Message-ID: <20260912065611.432607780@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065607.279695368@linuxfoundation.org> References: <20260912065607.279695368@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.6-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 @@ -2433,8 +2433,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);