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 8DD193043BA; Tue, 2 Sep 2025 13:40:12 +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=1756820413; cv=none; b=ZkGIrKtS3pwvvZD+G12BcqYtgwuRdCc70eMQg1ulePtef0qwnhaQinVQOaxid2Yix7ZFyXxOPAT1zbhHXHoXO1BRc5emoyDCePrfxje52eOdarr8a/vSMCyRCRS4irAosd1c/HNaqbIou09G1+10O5mahJbi8C7cDjSNoDJFM6g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756820413; c=relaxed/simple; bh=gWIObeqZM+ORYqYM+gfgPCt8B7SYcs8v1GEtEILKT0g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XqK1+D4VTmpIFB9G/UDaP/xUAoRcv8XQP2GumB9vvDmefl7lvfmRGfvPH7f9kP2OO6PjdJK8S4NuKGTJxegUhwvrP+zqgL7eVaktW1giOAhcOef3Drm5oESJzFSrmE//BSLypoVHI1geOgtPt2l71sjaDZxXhwExbpZrnwaGdZY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=fjb9RUY7; 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="fjb9RUY7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BEBEFC4CEED; Tue, 2 Sep 2025 13:40:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756820412; bh=gWIObeqZM+ORYqYM+gfgPCt8B7SYcs8v1GEtEILKT0g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fjb9RUY7Z402zbgCPqUpzGwn66BmEtY6Y5zCusOaDveRJuNHzuKABbpQ5viPqMK8C sfMGzxy/mDiff5yngVJUwTp9FS0WZVDm5eg2AamHoFM1pc7wxAVmR9hTpGaZdow3AV esulv+/TvZPCw/fBTJV1oesfEjRaV9gA/zrHlebg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Luiz Augusto von Dentz , Sasha Levin Subject: [PATCH 6.1 20/50] Bluetooth: hci_event: Detect if HCI_EV_NUM_COMP_PKTS is unbalanced Date: Tue, 2 Sep 2025 15:21:11 +0200 Message-ID: <20250902131931.327014879@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131930.509077918@linuxfoundation.org> References: <20250902131930.509077918@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org 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: Luiz Augusto von Dentz [ Upstream commit 15bf2c6391bafb14a3020d06ec0761bce0803463 ] This attempts to detect if HCI_EV_NUM_COMP_PKTS contain an unbalanced (more than currently considered outstanding) number of packets otherwise it could cause the hcon->sent to underflow and loop around breaking the tracking of the outstanding packets pending acknowledgment. Fixes: f42809185896 ("Bluetooth: Simplify num_comp_pkts_evt function") Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Sasha Levin --- net/bluetooth/hci_event.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index ff013e1d82a85..3d81afcccff8b 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -4409,7 +4409,17 @@ static void hci_num_comp_pkts_evt(struct hci_dev *hdev, void *data, if (!conn) continue; - conn->sent -= count; + /* Check if there is really enough packets outstanding before + * attempting to decrease the sent counter otherwise it could + * underflow.. + */ + if (conn->sent >= count) { + conn->sent -= count; + } else { + bt_dev_warn(hdev, "hcon %p sent %u < count %u", + conn, conn->sent, count); + conn->sent = 0; + } switch (conn->type) { case ACL_LINK: -- 2.50.1