Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6;
From:   Iulia Tanasescu <iulia.tanasescu@nxp.com>
To:     linux-bluetooth@vger.kernel.org
Cc:     claudia.rosu@nxp.com, mihai-octavian.urzica@nxp.com,
        silviu.barbulescu@nxp.com, vlad.pruteanu@nxp.com,
        andrei.istodorescu@nxp.com, luiz.dentz@gmail.com,
        Iulia Tanasescu <iulia.tanasescu@nxp.com>
Subject: [PATCH v3 1/1] Bluetooth: ISO: Allow binding a PA sync socket
Date:   Thu, 19 Oct 2023 17:49:22 +0300
Message-Id: <20231019144922.4700-2-iulia.tanasescu@nxp.com>
In-Reply-To: <20231019144922.4700-1-iulia.tanasescu@nxp.com>
References: <20231019144922.4700-1-iulia.tanasescu@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?1lmN0xKQBzaIZ23Z4pUk/8faCDAzbi/Qe434p6eYzn6+eeTrNUhpoTUcN202?=
 =?us-ascii?Q?3JXZsgQWY4xeCYKWQkWWPBSVTMsiX6IEA1/3qBr1v/UzFpJV0pPrOB7ND3Vi?=
 =?us-ascii?Q?9VjGrnYpxKvRVgutEE3hqogifRCC+5B/VIltb5NYbYqtcSpl6IzRP8mpm4K0?=
 =?us-ascii?Q?6COHFCm149rft69FkZlctIErc3KhBX3mu6olQTCs3CqNBuchRIfvfphjAOvz?=
 =?us-ascii?Q?zIKaJJ5tlcGtNEqCoSbZMxAYoh54EbTX/M7ntpoqlXQFzZ+0lG/HntMy6UfY?=
 =?us-ascii?Q?36SEHz5WRBCTOCBLSIRhGbbPZbSoU2SEkpjdYb+Nww9OhJ2+ujbt2pUBshCh?=
 =?us-ascii?Q?umZDamuvTtpM6AnQbTUe7xQ026Eb09ADx1vC2nDGG7RrFVc8Fk2aRfDrtNQB?=
 =?us-ascii?Q?MwZ/KKQNX6NwzmJlLjp5rpX3wNKx+Yr0aj+FqjSKGhnoQ24LPcHyxk0WdE22?=
 =?us-ascii?Q?9qVWXBSXF2NSrkn5RVthuo+Xl10S4VzMgA1IT4k4n5z/5FWRLEBECd50ywRs?=
 =?us-ascii?Q?Me6iL/6+tOaKSt0driySx7qvn2AoiP9iPfV5V97+NoWi5gWeOjYJKsVFXkfT?=
 =?us-ascii?Q?HkY2Puq19Y6XtKIOOYAD46shUVmpnqEDDHr4Bf5NtuaKgHOdU8StCEXwe70m?=
 =?us-ascii?Q?SmffFAK96ALeTQQG5lOiDqVv1dD4MI2AtnEjY/0dokrtM7eVTnzVo5z5YNpC?=
 =?us-ascii?Q?JxpM00yIGl2i5HTVhXM4QB4ieIbs+6FiBP9fHQHZtwUnmKUWvZ7yI2At2AC/?=
 =?us-ascii?Q?uS/Bx75ujGMtTul5IRRUJKksmTf711Sq1JsSOeNw5i95SBJcufS6eBN47EGt?=
 =?us-ascii?Q?Yem7SV/Z2sUWVZrbasbxg1kw7c9pSxEETHxPi6fxOci5ZLSoI0zIwuvh9VKK?=
 =?us-ascii?Q?vELC8+WzVnuUulmlTJ2/eYgDZwiGF7AQhEtouAmACAVkvV++tkqLxx42drbP?=
 =?us-ascii?Q?NwflC5tTlbBuwG7T5y3m8O/X5RRFe/9lYVMmNfmlcc10jhjHAtL/GdY9WLEM?=
 =?us-ascii?Q?1/V0naD3G1d4Q18yxrbVPH+EUnwz+b4VU38nYHhlLJGesliro1ESmFjXgynV?=
 =?us-ascii?Q?rCe9E2u+h7QuMVNntQ5oVvcC7UQcRduCkTzp3V4HyUONRuZxecHkTpIB5Xbm?=
 =?us-ascii?Q?HwVa8kN5TFIZH5SV3t3qCCGRyvwMKYGVcqVoJOb0mNHdP0RyZujlq/OEvBqi?=
 =?us-ascii?Q?I7iaqlGvoNqOeyWrrkrACj6zlE73BmvL0aTOMtGu5XbXnqvU56EUk3qGXRfk?=
 =?us-ascii?Q?ULqE2T4wr/1gP77N2TfPhiH02LPn3xxGyhjD8pw3ppcsSgUZrU+nGW3n+M/2?=
 =?us-ascii?Q?O2vqO0o65PXWwtR7HJlygkBhYI8yCdZssNj08KYahwxVz5WzW+ENnmVY7Csx?=
 =?us-ascii?Q?+HX8Q2LC9SNvdHacTXda1WYltwxPsRzb28qR2whkRRfRo6l5pGdbwcom3xCW?=
 =?us-ascii?Q?j0tqQn7LgPweJ8YxUa5rAIkh7gjYUx42joynnGLh+vCBUIwH0FTpxt5FZGL1?=
 =?us-ascii?Q?5W9mQxeEp3YaJFSavZScffPnqIBV6TjvrBFFIzKjL5IDO/Lq316+q1rnZ4bL?=
 =?us-ascii?Q?sh52sG9SUNlxSRL4WV26XMiI2KXxhKizwnsoDQabvU++lvYXqqpJ+9LE1lwC?=
 =?us-ascii?Q?Gg=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9b2ff723-a453-444b-ee81-08dbd0b29c62
X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8898.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2023 14:49:35.0552
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: eGFn5O9fGCLroOo1iqDXHg/W7Qzgx0MPuhqvFuGTmIFPydrjQRifPrxmSNZtFCsHCc0/WkcdKLrjuApwyxx0Ng==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8964
X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email
Precedence: bulk
List-ID: <linux-bluetooth.vger.kernel.org>
X-Mailing-List: linux-bluetooth@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Thu, 19 Oct 2023 07:50:04 -0700 (PDT)

This makes it possible to bind a PA sync socket to a number of BISes
before issuing the BIG Create Sync command.

Signed-off-by: Iulia Tanasescu <iulia.tanasescu@nxp.com>
---
 net/bluetooth/iso.c | 67 +++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 62 insertions(+), 5 deletions(-)

diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c
index 07b80e97aead..e01b6abe36fb 100644
--- a/net/bluetooth/iso.c
+++ b/net/bluetooth/iso.c
@@ -792,27 +792,75 @@ static int iso_sock_bind_bc(struct socket *sock, struct sockaddr *addr,
 	BT_DBG("sk %p bc_sid %u bc_num_bis %u", sk, sa->iso_bc->bc_sid,
 	       sa->iso_bc->bc_num_bis);
 
-	if (addr_len > sizeof(*sa) + sizeof(*sa->iso_bc))
+	if (addr_len != sizeof(*sa) + sizeof(*sa->iso_bc))
 		return -EINVAL;
 
 	bacpy(&iso_pi(sk)->dst, &sa->iso_bc->bc_bdaddr);
+
+	/* Check if the address type is of LE type */
+	if (!bdaddr_type_is_le(sa->iso_bc->bc_bdaddr_type))
+		return -EINVAL;
+
 	iso_pi(sk)->dst_type = sa->iso_bc->bc_bdaddr_type;
 	iso_pi(sk)->sync_handle = -1;
+
+	if (sa->iso_bc->bc_sid > 0x0f)
+		return -EINVAL;
+
 	iso_pi(sk)->bc_sid = sa->iso_bc->bc_sid;
+
+	if (sa->iso_bc->bc_num_bis > ISO_MAX_NUM_BIS)
+		return -EINVAL;
+
 	iso_pi(sk)->bc_num_bis = sa->iso_bc->bc_num_bis;
 
-	for (i = 0; i < iso_pi(sk)->bc_num_bis; i++) {
+	for (i = 0; i < iso_pi(sk)->bc_num_bis; i++)
 		if (sa->iso_bc->bc_bis[i] < 0x01 ||
 		    sa->iso_bc->bc_bis[i] > 0x1f)
 			return -EINVAL;
 
-		memcpy(iso_pi(sk)->bc_bis, sa->iso_bc->bc_bis,
-		       iso_pi(sk)->bc_num_bis);
-	}
+	memcpy(iso_pi(sk)->bc_bis, sa->iso_bc->bc_bis,
+	       iso_pi(sk)->bc_num_bis);
 
 	return 0;
 }
 
+static int iso_sock_bind_pa_sk(struct sock *sk, struct sockaddr_iso *sa,
+			       int addr_len)
+{
+	int err = 0;
+
+	if (sk->sk_type != SOCK_SEQPACKET) {
+		err = -EINVAL;
+		goto done;
+	}
+
+	if (addr_len != sizeof(*sa) + sizeof(*sa->iso_bc)) {
+		err = -EINVAL;
+		goto done;
+	}
+
+	if (sa->iso_bc->bc_num_bis > ISO_MAX_NUM_BIS) {
+		err = -EINVAL;
+		goto done;
+	}
+
+	iso_pi(sk)->bc_num_bis = sa->iso_bc->bc_num_bis;
+
+	for (int i = 0; i < iso_pi(sk)->bc_num_bis; i++)
+		if (sa->iso_bc->bc_bis[i] < 0x01 ||
+		    sa->iso_bc->bc_bis[i] > 0x1f) {
+			err = -EINVAL;
+			goto done;
+		}
+
+	memcpy(iso_pi(sk)->bc_bis, sa->iso_bc->bc_bis,
+	       iso_pi(sk)->bc_num_bis);
+
+done:
+	return err;
+}
+
 static int iso_sock_bind(struct socket *sock, struct sockaddr *addr,
 			 int addr_len)
 {
@@ -828,6 +876,15 @@ static int iso_sock_bind(struct socket *sock, struct sockaddr *addr,
 
 	lock_sock(sk);
 
+	/* Allow the user to bind a PA sync socket to a number
+	 * of BISes to sync to.
+	 */
+	if (sk->sk_state == BT_CONNECT2 &&
+	    test_bit(BT_SK_PA_SYNC, &iso_pi(sk)->flags)) {
+		err = iso_sock_bind_pa_sk(sk, sa, addr_len);
+		goto done;
+	}
+
 	if (sk->sk_state != BT_OPEN) {
 		err = -EBADFD;
 		goto done;
-- 
2.39.2