From patchwork Wed Sep 27 06:24:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Istodorescu X-Patchwork-Id: 13399999 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5BAADE80A93 for ; Wed, 27 Sep 2023 06:24:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229590AbjI0GYz (ORCPT ); Wed, 27 Sep 2023 02:24:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229550AbjI0GYx (ORCPT ); Wed, 27 Sep 2023 02:24:53 -0400 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2054.outbound.protection.outlook.com [40.107.6.54]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 826059C for ; Tue, 26 Sep 2023 23:24:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PPf6MYxju1g1xD6vzQgT3fsBWxM7+bcCtzfx/ZvyPLRtjaA2MgpCAhEFWpp5OuzDjgPK3ydDV8m/5P26GpuesoS3XlvtfF4NIdjJt/q8USUJ3OUCPQ30lJ/WNedD8uXr7Witbg+e8VlaIPRXEax/nRo1m9uG8lDWuXSs7OlNKzCkXgIrUj1yzVZ7qLhv7jSJTgORMD/1Hh4M0g0YtAlvQ1Nk97wv4jrGya/gflfScMENA9IpzVCtNRDy/dL2iiVLQxWQBC+WhctQaqzqaHvF0GTxE0G1JzQSsXRrOuwzQISIuxsFblO5dy9RIEgImdvLuXeUXflOZR7AzexpqqqElw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=N4kxkbiA1P8RApEctRA9+r0VtLfWKEj2k6WAE6pMMdw=; b=fF8gm67LYFFG/ZAiNvLc5Jrfz0yaWkWyo9PCrWylIBj48jlJY4MKmVJp3jhOEN3y4XqqyT8Rkt84GamNxQ4DOuyRtEghtybkwEYrS8LMbBXfjHqiyCgRWwappBVxYQfjBejA652shFzAppmzJrTZzoMc7Rn5RYhAzcG8Bw4sJzlQxuOdZOT2HLT4jwPeoTdRAzijVDv8jr/Br9bKVQZUiX61wNlRabW4KkhDgsBs0nofuhzZaa1FSFHO/bp4izeE3A6qocvVOxyb3o1Yk9Oree4fTRXvmzjailF5grB99MdkwqqYb7tyik0mhBP3WydjDEZWU4PgJsotzmBG6vEVRg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=N4kxkbiA1P8RApEctRA9+r0VtLfWKEj2k6WAE6pMMdw=; b=Pl1/XekV9+XSzkWAqTs9fx7CZm7mqBVGEBsMeGWbA1WyDkkUsqzt0HdSlbwx4rYZ/R3xHkSI2Sitx4xue7l8HmKG/IkmYYUZYW54SqcILUeIhozHpCBOesyjmXv7IG/6DJpP2P23oyMujHy75eW8ll/eYOvYB7wBXhvOiPZGqfs= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM9PR04MB8938.eurprd04.prod.outlook.com (2603:10a6:20b:409::20) by VI1PR04MB6910.eurprd04.prod.outlook.com (2603:10a6:803:135::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Wed, 27 Sep 2023 06:24:51 +0000 Received: from AM9PR04MB8938.eurprd04.prod.outlook.com ([fe80::20ce:af06:5cc:a1a4]) by AM9PR04MB8938.eurprd04.prod.outlook.com ([fe80::20ce:af06:5cc:a1a4%4]) with mapi id 15.20.6813.027; Wed, 27 Sep 2023 06:24:51 +0000 From: Andrei Istodorescu To: linux-bluetooth@vger.kernel.org Cc: claudia.rosu@nxp.com, mihai-octavian.urzica@nxp.com, silviu.barbulescu@nxp.com, vlad.pruteanu@nxp.com, iulia.tanasescu@nxp.com, luiz.dentz@gmail.com, Andrei Istodorescu Subject: [PATCH BlueZ 1/2] bap: Remove memory leaks and buffer usage after free. Date: Wed, 27 Sep 2023 09:24:35 +0300 Message-Id: <20230927062436.6306-2-andrei.istodorescu@nxp.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230927062436.6306-1-andrei.istodorescu@nxp.com> References: <20230927062436.6306-1-andrei.istodorescu@nxp.com> X-ClientProxiedBy: VI1PR08CA0236.eurprd08.prod.outlook.com (2603:10a6:802:15::45) To AM9PR04MB8938.eurprd04.prod.outlook.com (2603:10a6:20b:409::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM9PR04MB8938:EE_|VI1PR04MB6910:EE_ X-MS-Office365-Filtering-Correlation-Id: fdd06300-d7e5-4ffc-e233-08dbbf2274bf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zC7s/Mr2n8HF+fvVwPm4ltnUYRuLgiGJ94z5oXWDTcCSdUe2t9eA1O01cQ+WONEa9TqiBk/NuyNVIHlhTwUyJerzADHaSMwCXNnvLEijbeHhXxFb/mp5zqct5UFme5A+MKRbH6QyG3QbKlcodEu4vwpDwxaYYbcKdMXGQS9+YmYVJkPe6230PFh8RwmiNCExJgfyyw6CM/np2Y2B8WWO437E1C8I44u84m6ETGu3Zxzg10Q5ylJ4tB9g90055eDVduJ+TAwFnctshjbLtYIrVzcfezzRxgjW90CTc1UiIN+x4ODHV+3L8DtuKbOoZ6lA1v4cPaJajQgcV9kwUjkRQCwhWC1HwVr6AoZNl1ostgs+jIDQsVTZKuCMNTjFkUeUT26TMyTtep/ArYYYQDSluUdCJR6wvFfY8KwoWSkeyrPCDo4Nml4qP0vf+iS7P0MzSCxPwDPjrq66IChAncydc14konALYVPIzNCMt+SViTdiri4t9475kut6xcVLGxECwiTTKvveZoT3G+bSaQm9dk9aaf08IWA4DsDyEyfC4/sIB+NrmjcWuDOuh7PEc+88 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM9PR04MB8938.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(396003)(366004)(346002)(136003)(230922051799003)(451199024)(186009)(1800799009)(316002)(5660300002)(83380400001)(6916009)(41300700001)(44832011)(8676002)(8936002)(36756003)(2616005)(4326008)(66946007)(1076003)(6666004)(6486002)(6512007)(6506007)(66476007)(66556008)(26005)(86362001)(2906002)(38100700002)(478600001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UtmjILCdgG9OSFJ3TjQT2ShDSk8OQUPh+jU+kgS6OBti3OOHfG9tkPzK27Myyh3me2vKPNjVRwhs89Fpy8DD6uGse0isFiUFcaRO52W5aJ5YWbD8PdOZOwtcf43pGKdFyLAj3jah1vzTgloUJin+a3KXb7MG6s5OHS4RQ1uOdV916ZBh60TqD1tTln5327MwbRD9llwrnQGA6YRc5P+/OtdqbBgrBL5NKT+AFhqXIZFkGA5wXlY+W+j0neCjhv3p9V9du83ksDsS9b5QQ96JAnEjpghdo0EHiYNJ1yMxZ6QKtn6npuKIH2GPrhd7DU/D4qwDLAT75P8A8z55QF3fry17wYeeNQkikZeFL3sntmKShJ9luyFEiGO1r/iX17RVf85Zfq3eu+fj/LTDOWqARVHcTCPgevuMj4A4Q/prhDFCHjGlHBVcH8AkJKAZAvBhW2BDE1aSUCxnUjKMVm2FQ61XGxt5+It2+hY62U1c5Rdv6Iwi8W6VYTf1CSjnjFQg/Z0WHhXSoY5hz5pVATIpOckRvMUFJJvcY3le+TSWotVbTbXCk60hbHjuZAMszg+XB4psKR8MmZLYCuvst/B/OMwCI/LVIU3abmZHDsc4zyMIVv9c1ViGz6AFROS+pPT1PysSlT+vE8aNWSicQ4+AipkXiUCOkrhmqKUzQJg0nxXouLX/9FudJgmvjzyTbqr+LyQHf9idNBTRQDZ98N92sWZWa93aYpiQkCiks0g4xMLlZeNVLB+qP6hchmdBot9olhe7m6rNt1KzMXRfBD/eyl2QV/wjIkfVbvvf5+F9w/cHYZ5ohWpskWzbYjSCpSfpJXHOX+QY3/3bmJc/Pus4arLXcYu3hjlfPH6b4v65tXeDbPXpR/lH6BZnvGpdlweq7+B9PbzymHpQjj05/drRg13EhMdjee9jjX9Oy9iyY0KnoPMUbOeeoMuuT5GZFVPowTaxkjCBnVv7DJ5Fl4HlcK9FT7WJWwf3EkzuuPAqbMunsfYn3aiSU5lNpOUQ9g2SQXfPiGpZBBW98zHFCYQgO6AVGK9/a/Fy+Hm+cpB7VUxegsw+y4OWE4S9yxukj3cP4GgVo3+VUKynS0OhxcBeMnxtnJtvNNtRRzvX1zVOGTvlldI0h5xc24ylZlgHtFrnuJY3+0lji9YpZArhojrLEINCLdC9s/bUrxLLfb1aFmEwIUfav/0fz/pRptodGx760TntmxqK5qHO+xNM2L9wDbdJXJ3IA2mCuigsSdpDCurtl+jJbODsyav9DOk6jn4084waL4hXRAHnW8DHLN5A48o52zg6lhMOuiEr8lwjWELQcxx7zA0xAf57A2+RFhA7pvGQqoCCvmXB7bhmlduOPMHjkjhQVbo449eei1LEbNRaK7zN0N3teBBo5RCnQ6P+IQwJf3m0TGqUoT3GGn/ogOgqPevn9zkiYu6/tDKK5ObWFpTF6PHpH/ocM9S/IwrIuyjPGqyjDLxmGSn3a2Kzz/bbzHY+nYHTDBNtvXEbFSHvCGCzv3Cx5YoZGWoyV7uB4bg5nEljbNLO578arribi9AlLN++ApcBLVsoVeFsjymmpA2L43Y5Az2eRUHZxIFmdsJ60CC2+ldgEr0dpWQ5UA== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: fdd06300-d7e5-4ffc-e233-08dbbf2274bf X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8938.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2023 06:24:51.2571 (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: z5Fw3l8q67MUD6Kez27nUKP83PF60s7+r3BQecyCMvZcEmraZaF8DH17L/SSmAEiGpunIIogSbvtf7fteo6MUlbk1yNMlMwNPCgpwzTNhkQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6910 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Make sure the endpoint does not contain uninitialized pointers after creation. Rework parse_base and parse_array. Add missing unregister in bap_exit. --- profiles/audio/bap.c | 66 ++++++++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 27 deletions(-) -- 2.39.2 diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c index ee90426b9812..b164f68d3187 100644 --- a/profiles/audio/bap.c +++ b/profiles/audio/bap.c @@ -278,16 +278,17 @@ static const GDBusPropertyTable ep_properties[] = { static int parse_array(DBusMessageIter *iter, struct iovec **iov) { DBusMessageIter array; + struct iovec tmp_iov = {0}; if (!iov) return 0; - if (!(*iov)) - *iov = new0(struct iovec, 1); - dbus_message_iter_recurse(iter, &array); - dbus_message_iter_get_fixed_array(&array, &(*iov)->iov_base, - (int *)&(*iov)->iov_len); + dbus_message_iter_get_fixed_array(&array, &(tmp_iov).iov_base, + (int *)&(tmp_iov).iov_len); + + *iov = util_iov_dup(&tmp_iov, 1); + return 0; } @@ -300,7 +301,8 @@ static bool parse_base(void *data, size_t len, util_debug_func_t func, .iov_base = data, .iov_len = len, }; - + struct iovec *csc_iov = NULL; + struct iovec *meta_iov = NULL; uint8_t capsLen, metaLen; uint8_t *hexstream; @@ -330,22 +332,21 @@ static bool parse_base(void *data, size_t len, util_debug_func_t func, "Codec", codec->id, codec->cid, codec->vid); } + /* Fetch Codec Specific Configuration */ if (!util_iov_pull_u8(&iov, &capsLen)) return false; util_debug(func, NULL, "CC Len %d", capsLen); if (!capsLen) return false; - if (caps) { - if (!(*caps)) - *caps = new0(struct iovec, 1); - (*caps)->iov_len = capsLen; - (*caps)->iov_base = iov.iov_base; - } + csc_iov = new0(struct iovec, 1); + util_iov_memcpy(csc_iov, iov.iov_base, capsLen); + + /* Print Codec Specific Configuration */ for (int i = 0; capsLen > 1; i++) { struct bt_ltv *ltv = util_iov_pull_mem(&iov, sizeof(*ltv)); - uint8_t *caps; + uint8_t *csc; if (!ltv) { util_debug(func, NULL, "Unable to parse %s", @@ -356,35 +357,46 @@ static bool parse_base(void *data, size_t len, util_debug_func_t func, util_debug(func, NULL, "%s #%u: len %u type %u", "CC", i, ltv->len, ltv->type); - caps = util_iov_pull_mem(&iov, ltv->len - 1); - if (!caps) { + csc = util_iov_pull_mem(&iov, ltv->len - 1); + if (!csc) { util_debug(func, NULL, "Unable to parse %s", "CC"); return false; } - util_hexdump(' ', caps, ltv->len - 1, func, NULL); + util_hexdump(' ', csc, ltv->len - 1, func, NULL); capsLen -= (ltv->len + 1); } + /* Fetch Metadata */ if (!util_iov_pull_u8(&iov, &metaLen)) return false; util_debug(func, NULL, "Metadata Len %d", metaLen); if (!metaLen) return false; - if (meta) { - if (!(*meta)) - *meta = new0(struct iovec, 1); - (*meta)->iov_len = metaLen; - (*meta)->iov_base = iov.iov_base; - } + + meta_iov = new0(struct iovec, 1); + util_iov_memcpy(meta_iov, iov.iov_base, metaLen); hexstream = util_iov_pull_mem(&iov, metaLen); if (!hexstream) return false; util_hexdump(' ', hexstream, metaLen, func, NULL); + /* Update caps and meta with received Codec Specific Configuration and Metadata */ + if (caps) { + if (*caps) + util_iov_free(*caps, 1); + *caps = csc_iov; + } + + if (meta) { + if (*meta) + util_iov_free(*meta, 1); + *meta = meta_iov; + } + return true; } @@ -780,7 +792,6 @@ static void iso_bcast_confirm_cb(GIOChannel *io, GError *err, void *user_data) char address[18]; struct bap_ep *ep; int fd; - struct iovec *base_io; uint32_t presDelay; uint8_t numSubgroups; uint8_t numBis; @@ -807,12 +818,11 @@ static void iso_bcast_confirm_cb(GIOChannel *io, GError *err, void *user_data) if (!ep) return; + /* Update endpoint with the values of the peer's (BAP source) QOS */ update_bcast_qos(&qos, &ep->qos); - base_io = new0(struct iovec, 1); - util_iov_memcpy(base_io, base.base, base.base_len); - - parse_base(base_io->iov_base, base_io->iov_len, bap_debug, + /* Update endpoint with the value received from the peer's (BAP source) BASE */ + parse_base(base.base, base.base_len, bap_debug, &presDelay, &numSubgroups, &numBis, &codec, &ep->caps, &ep->metadata); @@ -917,6 +927,7 @@ static struct bap_ep *ep_register_bcast(struct bap_data *data, return ep; ep = new0(struct bap_ep, 1); + memset(ep, 0, sizeof(struct bap_ep)); ep->data = data; ep->lpac = lpac; ep->rpac = rpac; @@ -2288,6 +2299,7 @@ static int bap_init(void) static void bap_exit(void) { btd_profile_unregister(&bap_profile); + btd_profile_unregister(&bap_bcast_profile); bt_bap_unregister(bap_id); } From patchwork Wed Sep 27 06:24:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Istodorescu X-Patchwork-Id: 13400000 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5644BE80A93 for ; Wed, 27 Sep 2023 06:24:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229616AbjI0GY6 (ORCPT ); Wed, 27 Sep 2023 02:24:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56682 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229597AbjI0GY5 (ORCPT ); Wed, 27 Sep 2023 02:24:57 -0400 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2072.outbound.protection.outlook.com [40.107.6.72]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA23897 for ; Tue, 26 Sep 2023 23:24:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ex878PhKw6kgF0i4g152+XnJ+To6UsFnfoeqdvqQFpMNKGEfEwwEp87IqUwNhPRxYsNWc1Mri5aU7BpNmTcQfaoMSsP9e82rnRbxFJee6gUG4VLH6lTW80+PeTAOmJxJvG7YgzOHUV7hJNCHkyDKx8vdggCehwOl5KJWjGxj+zrm/cEV45i0H10CUTq3dg0kSyOkF7hie/L5phsUR6Ueq4my94SiEpV9WaRZM+CGDsulb2YpsSvitPhBevWXOtaoPz8qaMZZOxcDVL4PCbaGKS2u9qqCgpIiu+uy2RZqLcQyFTaQrZGUVcsi9qbacHmssizcD1HmlivtkmXRYfKbzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=FYw6UdbtKLdxsDAwX3AFPoBIQ9bUKsSLDb6kM86eQTc=; b=PjkV8S1hx1Mm7ltXvus39gzhii1TtGLw2Ox8Yqcck08zKfPqEin/Wy+lsMjIL9hHapvF1xFq9AoJceaCvMqXblsubTgacaJ5LLEmySuEURwvm07ecNrPXghFda7f69Jq8pUUuHSNimgCIVWRB+QyuqWDldIR3qTNv4x0e8C/+Bp8S8tEKaNNtFnd0gHCKD/p6Ha7W2brqDih9C9WUqqY3sw7DbyWm2HCT8jaxfZ3kFFFBsYiWlcU1qPFQp/14dNTu+J/tm1VuKSPV0JzL/OcedAa2S2iyPcBAJciGjXzGW+EpluqbEOnE4OWoDZcBvOwmeGHeC3Ikgj+Kb1DufAseQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FYw6UdbtKLdxsDAwX3AFPoBIQ9bUKsSLDb6kM86eQTc=; b=jcMGX2I1WojCdEETB+GQqDLNWbqp1AtGyhN8B5RNND2AvjVIbVnMYnyYBqQ0dTFYYUrGxlrHOYEs65XN/JUcXZz+6VA7VtE+IDf5yuX/df9PzBVt8awBCYJkCUshYhGJGL3pPd8hbF7giGJJE7PzLK2QwkU51wTIZOor3S2qDTo= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM9PR04MB8938.eurprd04.prod.outlook.com (2603:10a6:20b:409::20) by VI1PR04MB6910.eurprd04.prod.outlook.com (2603:10a6:803:135::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Wed, 27 Sep 2023 06:24:53 +0000 Received: from AM9PR04MB8938.eurprd04.prod.outlook.com ([fe80::20ce:af06:5cc:a1a4]) by AM9PR04MB8938.eurprd04.prod.outlook.com ([fe80::20ce:af06:5cc:a1a4%4]) with mapi id 15.20.6813.027; Wed, 27 Sep 2023 06:24:53 +0000 From: Andrei Istodorescu To: linux-bluetooth@vger.kernel.org Cc: claudia.rosu@nxp.com, mihai-octavian.urzica@nxp.com, silviu.barbulescu@nxp.com, vlad.pruteanu@nxp.com, iulia.tanasescu@nxp.com, luiz.dentz@gmail.com, Andrei Istodorescu Subject: [PATCH BlueZ 2/2] shared/bap: Set stream lpac to NULL after removing the stream. Date: Wed, 27 Sep 2023 09:24:36 +0300 Message-Id: <20230927062436.6306-3-andrei.istodorescu@nxp.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230927062436.6306-1-andrei.istodorescu@nxp.com> References: <20230927062436.6306-1-andrei.istodorescu@nxp.com> X-ClientProxiedBy: VI1P190CA0051.EURP190.PROD.OUTLOOK.COM (2603:10a6:800:1bb::10) To AM9PR04MB8938.eurprd04.prod.outlook.com (2603:10a6:20b:409::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM9PR04MB8938:EE_|VI1PR04MB6910:EE_ X-MS-Office365-Filtering-Correlation-Id: afa51fbd-b43a-4f59-59c9-08dbbf227650 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pKK2WuOSkc9h4Hyx/j6hAjJBaEYl34vHO3cBW7Bv4ii2sZQ62eKXndOQ9tVP3YvpQoix99TFotbOtYBPy/FAprWSVsJrBS7ujZBNL/tliR24pd3ysOsBqDFnfJyH18maMREC8qQbmleFIeyFs+Sgu3vdo2cjeAemSOPa8hXsOKTKoe6Wjbn5amVy9GBi3zw8TkVjLWHfhff4Ks36qyPruGV/eAG0z9PpZE5PTZSbyX7IZfGTr6m0kGaVWiCFimKU68sM31Z1Qt9osh6z9tkRJMKoNAXiNoEmMaLRbba+9TqKkXlSrdPY43jEGDOGwg+1PY5GQcrw9GYzc964MUOxkkvuWHyi9nYDhxSqr0o0X1Aq8nZk6epMch8tYmqc1ms0ckKfkwedHEUdMxh7rzEJce8+uAPJrAWe0jRXDibykK95DqwdrjYGeqbrydze9jklapbHdfEwRQcQiFTp4E5HsxlRVeyzjTciHDVRYtCgDwosz1MxScM0ZzJg7nXLBfBKpraqRU+Q43Ww3J0rCWx/YGTvesIN368H5Y1sp8joEPVP+KZU518ULQhUsdhw84Zw X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM9PR04MB8938.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(396003)(366004)(346002)(136003)(230922051799003)(451199024)(186009)(1800799009)(4744005)(316002)(5660300002)(83380400001)(6916009)(41300700001)(44832011)(8676002)(8936002)(36756003)(2616005)(4326008)(66946007)(1076003)(6666004)(6486002)(6512007)(6506007)(66476007)(66556008)(26005)(86362001)(2906002)(38100700002)(478600001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2FEZQAX+LBCCqP6Qe70KLsRN7d6fKsAyQQa1uyGV2ATXe+eOsxxzclDu30CFaXaZWRo8lX+VuETh5AxhUhHhRqtGbPZr0srLWxeaUQkDtMpkKewaLqjRtTf/mLekjXHV8DqGBBDaLkw8S2pOBjE5egC6y0MWYhb3KiDB5WADtHa/HeEUo76HBDuvmeUxL6ym1fusl361EGGrS80RgiX6TEswlKd8SJhD/MEWUdDOLNQ3oo3tf4Kdbx0F+zWkRN82TS3qtuMM8KyhKpLhCYjdhGxTJZmCcKlLmbdnvc1MTj8alYEFxxGncDrlrOxYprKE5R76NmaLiaBN6nbkphr2zT6IVnpQT83JVdomoQYCsyZSP2lSM6lYtASs7r/qc8ip5neVtb6Nh0P+KgjZ/VQRetys7EDNd48+qMuCf0UUm3YkIu2l5lk/TQCtcsPzqnyDtQq6nsPxnLWdq8zxmtmHGwGyKp+L+UQ4t9GmUOow6zeF83gwmTcmESkvnB5L0aQvSsq1H7q6w9ofiZkWX9Mn957sEC03c/jrTbD3x4z29ts0G1r70D5oPLkb+Y5ekf3caaaYdt4YtuGscGt4EJuEuaGHtRw2EEjR5zYA2F49L60rKyxclst21qAxOtVIOyp/S+7kRhSm7DJlTUgws8zTpxDQkjlu2ym3j49LV6Y6PeOW5A7e9qlJ4Sf27oE2gDKtF4imKzkBfnY7E/R3b+0oXHzPEL9wEHeIbcw59LBVtKZkuUSSJlpmXrz9ykPztF0dse80UEdPQekJ1Jo+L9uyCMd8MIshH3qqfQA1TzrEBLysxp3IWlfM5e2ac3ezQKHXQ9MRyaun9gnK5a2sVrzulp+EDubS3ojxedjeKx3oF9++v+6vbuOToi5KMWp4LBj/qXVTC+u518iBr2pZt3+WcowBF/v6s0OD3kv55d9ATkGir5TYdzH2LYEls3Lt2U/C0MUn4wB0lkz3urYFINPTjRvdLIDRg931yptRmgFK08Y5Ve17nCvJ8+slsRjILrTfesE2CEwBMALI0qmKKCOQB37lraIqQU+1WoqIPl54pCDhn/gpVdmi44NEjsJAAner1khsp1/babvEIyW9hfp2nzf+gvClR71Ls2Vs5fUgJKTrvJQ6cmLSsy2zhMRj4mx0YI24rFHZ1fsHuUsLiNsyzTYOJsXvZXduL98/2p/6O8Wk00Pd2F21BxeHpc4HLnIl65WKhV5743iZnJLBsJsPowdYn8MzbvCVzvwfY5lbXNN2fADFqZTk5TS/ulE09PjPMI1jyGjQOO//WuL2Uv4wqSqSNeRJJQQyxTV7XBdXG0v9C0Wx9knicC6CSFnokVAVRF8BFwJVt5hJKMlOU+JeUCeKQm/ENl1ZGoxUsVh06Kt+J/TH00xyB6q3BmxVqJSFl+GqXu5A4ILQk181h2MNW0yWKHWI08xrl8OZHwEYBi91AgmtExaB/801/xiL+Sm1ommIujAJ9pndfuXvYRnRTqjqKOypzL2LYv+Si12T7bsmffhweIngV2+PqFJQWWcMI4ZA3vfr9wret9Mv5tsdrNFPr0DRT72X2WuDPv/Rym7FsEp623eouiUb1bqTWEIKHhciZMlcSxUJujmCGfQ3Ng== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: afa51fbd-b43a-4f59-59c9-08dbbf227650 X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8938.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2023 06:24:53.8812 (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: PcT8WJNAo9+FDuQ3hzUOdvQ2IKhXmix27b1PQYN1ok2S8uHktxV0zeyKeXyylIAU+gtTuRQQkZZ1QH0tAYa3kKdiJMG0JWTithdlWrxmLn0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6910 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This is required as the pac is freed in another place and will result in a dangling pointer. --- src/shared/bap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.39.2 diff --git a/src/shared/bap.c b/src/shared/bap.c index 1c43680c2457..a0f0135eb135 100644 --- a/src/shared/bap.c +++ b/src/shared/bap.c @@ -2681,8 +2681,10 @@ static void remove_streams(void *data, void *user_data) struct bt_bap_stream *stream; stream = queue_remove_if(bap->streams, match_stream_lpac, pac); - if (stream) + if (stream) { + stream->lpac = NULL; /* mark stream->lpac to NULL, as it will be freed in bt_bap_remove_pac */ bt_bap_stream_release(stream, NULL, NULL); + } } bool bt_bap_remove_pac(struct bt_bap_pac *pac)