Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35;
From:   Andrei Istodorescu <andrei.istodorescu@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,
        iulia.tanasescu@nxp.com, luiz.dentz@gmail.com,
        Andrei Istodorescu <andrei.istodorescu@nxp.com>
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>
In-Reply-To: <20230927062436.6306-1-andrei.istodorescu@nxp.com>
References: <20230927062436.6306-1-andrei.istodorescu@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?2FEZQAX+LBCCqP6Qe70KLsRN7d6fKsAyQQa1uyGV2ATXe+eOsxxzclDu30CF?=
 =?us-ascii?Q?aXaZWRo8lX+VuETh5AxhUhHhRqtGbPZr0srLWxeaUQkDtMpkKewaLqjRtTf/?=
 =?us-ascii?Q?mLekjXHV8DqGBBDaLkw8S2pOBjE5egC6y0MWYhb3KiDB5WADtHa/HeEUo76H?=
 =?us-ascii?Q?BDuvmeUxL6ym1fusl361EGGrS80RgiX6TEswlKd8SJhD/MEWUdDOLNQ3oo3t?=
 =?us-ascii?Q?f4Kdbx0F+zWkRN82TS3qtuMM8KyhKpLhCYjdhGxTJZmCcKlLmbdnvc1MTj8a?=
 =?us-ascii?Q?lYEFxxGncDrlrOxYprKE5R76NmaLiaBN6nbkphr2zT6IVnpQT83JVdomoQYC?=
 =?us-ascii?Q?syZSP2lSM6lYtASs7r/qc8ip5neVtb6Nh0P+KgjZ/VQRetys7EDNd48+qMuC?=
 =?us-ascii?Q?f0UUm3YkIu2l5lk/TQCtcsPzqnyDtQq6nsPxnLWdq8zxmtmHGwGyKp+L+UQ4?=
 =?us-ascii?Q?t9GmUOow6zeF83gwmTcmESkvnB5L0aQvSsq1H7q6w9ofiZkWX9Mn957sEC03?=
 =?us-ascii?Q?c/jrTbD3x4z29ts0G1r70D5oPLkb+Y5ekf3caaaYdt4YtuGscGt4EJuEuaGH?=
 =?us-ascii?Q?tRw2EEjR5zYA2F49L60rKyxclst21qAxOtVIOyp/S+7kRhSm7DJlTUgws8zT?=
 =?us-ascii?Q?pxDQkjlu2ym3j49LV6Y6PeOW5A7e9qlJ4Sf27oE2gDKtF4imKzkBfnY7E/R3?=
 =?us-ascii?Q?b+0oXHzPEL9wEHeIbcw59LBVtKZkuUSSJlpmXrz9ykPztF0dse80UEdPQekJ?=
 =?us-ascii?Q?1Jo+L9uyCMd8MIshH3qqfQA1TzrEBLysxp3IWlfM5e2ac3ezQKHXQ9MRyaun?=
 =?us-ascii?Q?9gnK5a2sVrzulp+EDubS3ojxedjeKx3oF9++v+6vbuOToi5KMWp4LBj/qXVT?=
 =?us-ascii?Q?C+u518iBr2pZt3+WcowBF/v6s0OD3kv55d9ATkGir5TYdzH2LYEls3Lt2U/C?=
 =?us-ascii?Q?0MUn4wB0lkz3urYFINPTjRvdLIDRg931yptRmgFK08Y5Ve17nCvJ8+slsRjI?=
 =?us-ascii?Q?LrTfesE2CEwBMALI0qmKKCOQB37lraIqQU+1WoqIPl54pCDhn/gpVdmi44NE?=
 =?us-ascii?Q?jsJAAner1khsp1/babvEIyW9hfp2nzf+gvClR71Ls2Vs5fUgJKTrvJQ6cmLS?=
 =?us-ascii?Q?sy2zhMRj4mx0YI24rFHZ1fsHuUsLiNsyzTYOJsXvZXduL98/2p/6O8Wk00Pd?=
 =?us-ascii?Q?2F21BxeHpc4HLnIl65WKhV5743iZnJLBsJsPowdYn8MzbvCVzvwfY5lbXNN2?=
 =?us-ascii?Q?fADFqZTk5TS/ulE09PjPMI1jyGjQOO//WuL2Uv4wqSqSNeRJJQQyxTV7XBdX?=
 =?us-ascii?Q?G0v9C0Wx9knicC6CSFnokVAVRF8BFwJVt5hJKMlOU+JeUCeKQm/ENl1ZGoxU?=
 =?us-ascii?Q?sVh06Kt+J/TH00xyB6q3BmxVqJSFl+GqXu5A4ILQk181h2MNW0yWKHWI08xr?=
 =?us-ascii?Q?l8OZHwEYBi91AgmtExaB/801/xiL+Sm1ommIujAJ9pndfuXvYRnRTqjqKOyp?=
 =?us-ascii?Q?zL2LYv+Si12T7bsmffhweIngV2+PqFJQWWcMI4ZA3vfr9wret9Mv5tsdrNFP?=
 =?us-ascii?Q?r0DRT72X2WuDPv/Rym7FsEp623eouiUb1bqTWEIKHhciZMlcSxUJujmCGfQ3?=
 =?us-ascii?Q?Ng=3D=3D?=
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
X-Spam-Status: No, score=-0.9 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 groat.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 (groat.vger.email [0.0.0.0]); Tue, 26 Sep 2023 23:25:01 -0700 (PDT)

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(-)

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)
--
2.39.2