From: Bastien Nocera <hadess@hadess.net>
To: linux-bluetooth@vger.kernel.org
Cc: Bastien Nocera <hadess@hadess.net>
Subject: [BlueZ 08/15] shared/bap: Fix possible use-after-free
Date: Thu, 16 May 2024 11:03:12 +0200 [thread overview]
Message-ID: <20240516090340.61417-9-hadess@hadess.net> (raw)
In-Reply-To: <20240516090340.61417-1-hadess@hadess.net>
stream_set_state() might call bap_stream_detach() if the stream is in
the process of being detached, causing a use-after-free.
Return false from stream_set_state() if the stream is unsafe to
manipulate (ie. was in the process of being detached and freed).
Error: USE_AFTER_FREE (CWE-416): [#def37] [important]
bluez-5.75/src/shared/bap.c:2490:2: freed_arg: "stream_set_state" frees "stream".
bluez-5.75/src/shared/bap.c:2493:2: deref_after_free: Dereferencing freed pointer "stream".
2491|
2492| /* Sink can autonomously for to Streaming state if io already exits */
2493|-> if (stream->io && stream->ep->dir == BT_BAP_SINK)
2494| stream_set_state(stream, BT_BAP_STREAM_STATE_STREAMING);
2495|
---
src/shared/bap.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/shared/bap.c b/src/shared/bap.c
index 1316d7c73d02..0026bc8dc989 100644
--- a/src/shared/bap.c
+++ b/src/shared/bap.c
@@ -1298,7 +1298,8 @@ static void bap_stream_state_changed(struct bt_bap_stream *stream)
}
}
-static void stream_set_state(struct bt_bap_stream *stream, uint8_t state)
+/* Return false if the stream is being detached */
+static bool stream_set_state(struct bt_bap_stream *stream, uint8_t state)
{
struct bt_bap *bap = stream->bap;
@@ -1308,13 +1309,14 @@ static void stream_set_state(struct bt_bap_stream *stream, uint8_t state)
bap = bt_bap_ref_safe(bap);
if (!bap) {
bap_stream_detach(stream);
- return;
+ return false;
}
if (stream->ops && stream->ops->set_state)
stream->ops->set_state(stream, state);
bt_bap_unref(bap);
+ return true;
}
static void ep_config_cb(struct bt_bap_stream *stream, int err)
@@ -2487,7 +2489,8 @@ static uint8_t stream_enable(struct bt_bap_stream *stream, struct iovec *meta,
util_iov_free(stream->meta, 1);
stream->meta = util_iov_dup(meta, 1);
- stream_set_state(stream, BT_BAP_STREAM_STATE_ENABLING);
+ if (!stream_set_state(stream, BT_BAP_STREAM_STATE_ENABLING))
+ return 1;
/* Sink can autonomously for to Streaming state if io already exits */
if (stream->io && stream->ep->dir == BT_BAP_SINK)
--
2.44.0
next prev parent reply other threads:[~2024-05-16 9:03 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-16 9:03 [BlueZ 00/15] Fix a number of static analysis issues #2 Bastien Nocera
2024-05-16 9:03 ` [BlueZ 01/15] main: Simplify variable assignment Bastien Nocera
2024-05-16 9:03 ` [BlueZ 02/15] shared/ecc: Fix uninitialised variable usage Bastien Nocera
2024-05-16 9:03 ` [BlueZ 03/15] shared/gatt-client: " Bastien Nocera
2024-05-16 9:03 ` [BlueZ 04/15] tools/mesh-cfgclient: " Bastien Nocera
2024-05-16 9:03 ` [BlueZ 05/15] test-runner: Remove unused envp Bastien Nocera
2024-05-16 9:03 ` [BlueZ 06/15] test-runner: Fix uninitialised variable usage Bastien Nocera
2024-05-16 9:03 ` [BlueZ 07/15] " Bastien Nocera
2024-05-16 9:03 ` Bastien Nocera [this message]
2024-05-16 9:03 ` [BlueZ 09/15] isotest: Fix bad free Bastien Nocera
2024-05-16 9:03 ` [BlueZ 10/15] test-runner: Fix fd leak on failure Bastien Nocera
2024-05-16 9:03 ` [BlueZ 11/15] isotest: Fix string size expectations Bastien Nocera
2024-05-16 9:03 ` [BlueZ 12/15] mgmt-tester: Fix non-nul-terminated string Bastien Nocera
2024-05-16 9:03 ` [BlueZ 13/15] gdbus: Check sprintf retval Bastien Nocera
2024-05-16 9:03 ` [BlueZ 14/15] shared/bap: Fix memory leak in error path Bastien Nocera
2024-05-16 9:03 ` [BlueZ 15/15] android/handsfree: Check sprintf retval Bastien Nocera
2024-05-16 20:50 ` [BlueZ 00/15] Fix a number of static analysis issues #2 patchwork-bot+bluetooth
2024-05-27 8:23 ` Bastien Nocera
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240516090340.61417-9-hadess@hadess.net \
--to=hadess@hadess.net \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox