Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Iulia Tanasescu <iulia.tanasescu@nxp.com>
To:     linux-bluetooth@vger.kernel.org
Cc:     Iulia Tanasescu <iulia.tanasescu@nxp.com>
Subject: [PATCH 1/1] Bluetooth: ISO: cleanup bound BISes
Date:   Wed,  7 Jun 2023 11:20:11 +0300
Message-Id: <20230607082011.4915-2-iulia.tanasescu@nxp.com>
In-Reply-To: <20230607082011.4915-1-iulia.tanasescu@nxp.com>
References: <20230607082011.4915-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?KhkoYK1X0X68yB4p6ICq93QfJW/r28tokUP845TUWjfmR4Dl7mfzUMZQ1+RH?=
 =?us-ascii?Q?oOkmiIjiQY6JsyXfaXsLdw42ELokoKSg95PjF9F0Y7wQYFH/WIBd2W0US2rQ?=
 =?us-ascii?Q?pHQYCTaqPo3ElvxJqFkZ4/HJ43qe9ilPh9Wq27vqXlTdmMwhKnFpy1BApZsM?=
 =?us-ascii?Q?Rl5agiD/rKRELk+TOgWJyYIW5QGUG/Vi2ndQ/VgqAVWYwAwhlaxm346PUEMF?=
 =?us-ascii?Q?wWqASlfaIls1YGin3uDoegUggh8ij/ZufKN9lqVD66IQrV8XQ9F9bAkF5fyO?=
 =?us-ascii?Q?7zFQpU0FSbN1RYTDFuVMHHca7zMA8GmeEgjoUhwm/Rh2wlj70GyQIwM2iItj?=
 =?us-ascii?Q?KSSzwlPJ5TLhkXRwJUziEHdbHPLWmA3tbcSjrHCxiRscB8tGXUscMdWx15tj?=
 =?us-ascii?Q?iG8ja0V2HohAvFccehtYPNL1GrPC96qCXtQo9iuZG8D5mus6jRN7FwwmCmFW?=
 =?us-ascii?Q?iR4/7By8s3G7j9jNBY6fDkk1EEiuwVnW4SXTDjZk1zYAFzD7WcOQVrA65nbL?=
 =?us-ascii?Q?rgTWfeKk7muQe5xJBQWJAl1BLU/dUFeRAXbEJtsSiKBtbrx1ZsJDLqKneqRW?=
 =?us-ascii?Q?wmxF4IBH3g8U99RN1wTtR3wraJDRO+zmTjg1tp/LAdpf+UnuOCbSrEd2OUnF?=
 =?us-ascii?Q?TdII+pLdbtxjYWvORmZkBn/zqtQB6gNEOZxm9C4JY2q2MPUm3+eHuUFQUb96?=
 =?us-ascii?Q?/q8o53y1Ojsl3wy2Dfh1mqRBdORK1ENRK3FpOusCvI808UbJf+L5dYFsmAEm?=
 =?us-ascii?Q?AZ5MtcdOCVoGmCFw9HqC/5tKccYqq5pPEV4CENeWr3A/Jy0IxIbrnVmWBq1t?=
 =?us-ascii?Q?MJQQFk1ptOlUvkVIYmJGuBwxhA8EBAObn/VVmP3flRJamRqGgWa7oVohjuR+?=
 =?us-ascii?Q?XJAjCkn91yjN3dV98lFTDnEWh4Byb8VxYc5hBdWDTwYwMBH8Nf55QEDQnwZ4?=
 =?us-ascii?Q?LNB3B+cDvhrmrPvQRdaARslQ7D315FHwcCb8Zpu681i6aZG+ADikP8WjFqeg?=
 =?us-ascii?Q?Er3+Jr6bz+08f8BeSMJitfjXH0O8OxEyvwxMeZKCPZkmMO0n4506tq1+Z7bx?=
 =?us-ascii?Q?ESmcIWpFT+UWusP8TF9GCF0vwc9CfS9QgzLGumxVsVD3e7YEXu8VI7uzOBj4?=
 =?us-ascii?Q?53eYoMaeyQih751MqytU0Yi2DzhF3v89bfqEANvrq0a4UoUTA6VuDCzHi0yU?=
 =?us-ascii?Q?f32LHVbGXipm3DiLYl0q4F7enlGCEcJOWu+DzYh55G3SYJL/iSEnZSFy/lAB?=
 =?us-ascii?Q?HZK1J2Da4ANELGGNXYSFihtiBiCA6ncs9U1ew+2g6viJ4zfbRnnEyXwCvwcm?=
 =?us-ascii?Q?rq+OViTbIfQKWGkGFHgZqCRBKZ8a/gVBH2CDlwSR4RLUFi2ciq+By7sGm1Br?=
 =?us-ascii?Q?TvrLzvDynVWPmRgEjgh2IqCMJATIHGr9UxjhiWHsXBp+hcIBTN1UwTDsvV3r?=
 =?us-ascii?Q?MsVje7ZQf2z/6ZhdHTBtN6YezjWc0SxQt7KyaYOIbxb8QNDQykQ2Df+O9nEE?=
 =?us-ascii?Q?wCClKU71eZMDyufR/LNCFd82xg4J40r4EluKwerVh5FIIAs5REzDpM6m92jW?=
 =?us-ascii?Q?FMAGWok742eIMF1T5BbyzgIl9AevaHQ78wBcRHfF2TZ/7k5/GlMqomi5kGI/?=
 =?us-ascii?Q?Aw=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 810fd935-3af1-4052-945c-08db67301461
X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8898.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jun 2023 08:20:40.2684
 (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: LfnPPVz0c2UQelUrQCnijTGqjzqxYsEOdGOo2jr2erhYmMqy3+xbQXsCbRRxJMWj7LjgCUCtuxyp0w7podDo6g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7299
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-bluetooth.vger.kernel.org>
X-Mailing-List: linux-bluetooth@vger.kernel.org

For some broadcast scenarios, the user might open a nonblocking socket
and might call connect without defer setup - this will queue the
commands for adding an advertising instance and creating a BIG.

If the socket is closed before the LE BIG Complete event arrives
(connection is still pending), the conn should be properly cleaned up:
it should be removed from the hash list, the adv set should be removed,
and the BIG will be terminated once the LE BIG Complete event arrives,
since no active connections will be found at that point.

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

diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c
index b9a008fd10b1..261e26ec8f16 100644
--- a/net/bluetooth/iso.c
+++ b/net/bluetooth/iso.c
@@ -655,13 +655,15 @@ static void __iso_sock_close(struct sock *sk)
 			iso_conn_defer_reject(iso_pi(sk)->conn->hcon);
 		iso_chan_del(sk, ECONNRESET);
 		break;
+
 	case BT_CONNECT:
-		/* In case of DEFER_SETUP the hcon would be bound to CIG which
-		 * needs to be removed so just call hci_conn_del so the cleanup
-		 * callback do what is needed.
+		/* In case hcon is bound to a CIG/BIG, just call
+		 * hci_conn_del so the cleanup callback does what
+		 * is needed.
 		 */
-		if (test_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags) &&
-		    iso_pi(sk)->conn->hcon) {
+		if ((!bacmp(&iso_pi(sk)->dst, BDADDR_ANY) ||
+		     test_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags)) &&
+		     iso_pi(sk)->conn->hcon) {
 			hci_conn_del(iso_pi(sk)->conn->hcon);
 			iso_pi(sk)->conn->hcon = NULL;
 		}
-- 
2.34.1