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 3EC833B2D1D; Tue, 21 Jul 2026 22:16:21 +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=1784672183; cv=none; b=p1MoY2NzK4/CRCpNSsQWF84T78D6k7A05SrAJ4xcczJ074kua4Zf8d7vneUpc5zpc156bnVcfabtjabfrIyvquGTM0sKIPKmqefmUQIukOVo5MvJw0fXox2ubfreUf8K0SkgsQf0NpgDqXukezTHHZV3Fx4Os+lgCs3NCufqoIw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784672183; c=relaxed/simple; bh=GZBqIVguXyTkfMv4lOlTyyx1zLfJw6ux+nihXwVDMnc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kpzFI0lDW54BFLNyZtso/HuVeuPMGyigivPbSl0f/2AslMx1//xeCWYv0odxbycAPGIYIXZqyNUaf2vz0WYnoqx1kHuB+bOWGfUO06diM6FZaqRFoEIeBW6987CMfOpx10IH7/6EQ7dah5u2+UAzHjbRsTu3pr2p38U4OmlWxI0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=EPf0qGjN; 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="EPf0qGjN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 649E11F000E9; Tue, 21 Jul 2026 22:16:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784672181; bh=6+9QWc1Xx7q0mvJM3i/8mnk+oXlRMfCrVe6Skj2Mqcw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EPf0qGjNx+negPick7wfuytU81ZqdKWynPLynMRlk8KtPyEVGyGny5Bivii48Gf7u UlBKNwfoXFtEt272fVmalsYNtxsxKdhe5Z3HnYRQ7rZ8+6wtx/tJk1GSYYtYzfCeTN fMMkAfYgJDn18E1CKuBCLiJM9E8up883JUexgOpI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pauli Virtanen , Luiz Augusto von Dentz , Sasha Levin Subject: [PATCH 5.15 527/843] Bluetooth: ISO: exclude RFU bits from ISO_SDU_Length Date: Tue, 21 Jul 2026 17:22:42 +0200 Message-ID: <20260721152417.886540205@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152405.946368001@linuxfoundation.org> References: <20260721152405.946368001@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 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pauli Virtanen [ Upstream commit fd076d8deeab6f9f18ef13400f89e1f550df665b ] slen contains ISO_SDU_Length (12 bits), RFU (2 bits), Packet_Status_Flags (2 bits). Exclude the RFU bits from hci_iso_data_len. Also add masks to the pack macro. Fixes: 4de0fc599eb9 ("Bluetooth: Add definitions for CIS connections") Signed-off-by: Pauli Virtanen Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Sasha Levin --- include/net/bluetooth/hci.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 9ce46cb8564d64..a715ebb53b0335 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -2556,8 +2556,9 @@ static inline struct hci_sco_hdr *hci_sco_hdr(const struct sk_buff *skb) #define hci_iso_flags_pack(pb, ts) ((pb & 0x03) | ((ts & 0x01) << 2)) /* ISO data length and flags pack/unpack */ -#define hci_iso_data_len_pack(h, f) ((__u16) ((h) | ((f) << 14))) -#define hci_iso_data_len(h) ((h) & 0x3fff) +#define hci_iso_data_len_pack(h, f) ((__u16) (((h) & 0x0fff) | \ + (((f) & 0x3) << 14))) +#define hci_iso_data_len(h) ((h) & 0x0fff) #define hci_iso_data_flags(h) ((h) >> 14) /* le24 support */ -- 2.53.0