From: Ismagil Iskakov <i.iskakov@omp.ru>
To: <linux-bluetooth@vger.kernel.org>
Cc: Ismagil Iskakov <i.iskakov@omp.ru>
Subject: [PATCH BlueZ 03/11] src/shared: add nullity checks
Date: Tue, 8 Jul 2025 10:33:26 +0300 [thread overview]
Message-ID: <20250708073334.2393559-4-i.iskakov@omp.ru> (raw)
In-Reply-To: <20250708073334.2393559-1-i.iskakov@omp.ru>
Check util_iov_pull_mem where iov len is not verified
beforehand. Check vcp_get_vcs for NULL.
These changes are based on other usages where those
checks exist.
---
src/shared/bap.c | 23 +++++++++++++++++++++++
src/shared/vcp.c | 3 +++
2 files changed, 26 insertions(+)
diff --git a/src/shared/bap.c b/src/shared/bap.c
index 76340d565..a866f4cdc 100644
--- a/src/shared/bap.c
+++ b/src/shared/bap.c
@@ -7457,6 +7457,11 @@ bool bt_bap_parse_base(uint8_t sid, struct iovec *iov,
codec = util_iov_pull_mem(iov, sizeof(*codec));
+ if (!codec) {
+ ret = false;
+ goto done;
+ }
+
util_debug(func, NULL, "Codec: ID %d CID 0x%2.2x VID 0x%2.2x",
codec->id, codec->cid, codec->vid);
@@ -7468,6 +7473,12 @@ bool bt_bap_parse_base(uint8_t sid, struct iovec *iov,
}
l2_cc.iov_base = util_iov_pull_mem(iov, l2_cc_len);
+
+ if (!l2_cc.iov_base) {
+ ret = false;
+ goto done;
+ }
+
l2_cc.iov_len = l2_cc_len;
/* Print Codec Specific Configuration */
@@ -7482,6 +7493,12 @@ bool bt_bap_parse_base(uint8_t sid, struct iovec *iov,
}
meta.iov_base = util_iov_pull_mem(iov, meta_len);
+
+ if (!meta.iov_base) {
+ ret = false;
+ goto done;
+ }
+
meta.iov_len = meta_len;
/* Print Metadata */
@@ -7512,6 +7529,12 @@ bool bt_bap_parse_base(uint8_t sid, struct iovec *iov,
l3_cc.iov_base = util_iov_pull_mem(iov,
l3_cc_len);
+
+ if (!l3_cc.iov_base) {
+ ret = false;
+ goto done;
+ }
+
l3_cc.iov_len = l3_cc_len;
/* Print Codec Specific Configuration */
diff --git a/src/shared/vcp.c b/src/shared/vcp.c
index c96ad4376..a13b9d953 100644
--- a/src/shared/vcp.c
+++ b/src/shared/vcp.c
@@ -2934,6 +2934,9 @@ static void foreach_vcs_service(struct gatt_db_attribute *attr,
struct bt_vcp *vcp = user_data;
struct bt_vcs *vcs = vcp_get_vcs(vcp);
+ if (!vcs)
+ return;
+
vcs->service = attr;
gatt_db_service_set_claimed(attr, true);
--
2.34.1
next prev parent reply other threads:[~2025-07-08 7:35 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-08 7:33 [PATCH BlueZ 00/11] Fix bugs found by static analysis Ismagil Iskakov
2025-07-08 7:33 ` [PATCH BlueZ 01/11] btio: fix range validation of security level Ismagil Iskakov
2025-07-08 7:51 ` Fix bugs found by static analysis bluez.test.bot
2025-07-08 7:33 ` [PATCH BlueZ 02/11] profiles/audio: add nullity checks Ismagil Iskakov
2025-07-08 7:33 ` Ismagil Iskakov [this message]
2025-07-08 7:33 ` [PATCH BlueZ 04/11] isotest: close fd after sending when nconn=1 Ismagil Iskakov
2025-07-08 7:33 ` [PATCH BlueZ 05/11] obexd/client: fix err condition causing memleak Ismagil Iskakov
2025-07-08 7:33 ` [PATCH BlueZ 06/11] profiles/audio: fix memleak of bt_bap Ismagil Iskakov
2025-07-08 7:33 ` [PATCH BlueZ 07/11] src/shared: fix memleak Ismagil Iskakov
2025-07-08 7:33 ` [PATCH BlueZ 08/11] src/shared: move null checks before dereferencing Ismagil Iskakov
2025-07-08 7:33 ` [PATCH BlueZ 09/11] isotest: remove repeating conditions Ismagil Iskakov
2025-07-08 7:33 ` [PATCH BlueZ 10/11] profiles/audio: fix io_unlink args order Ismagil Iskakov
2025-07-08 7:33 ` [PATCH BlueZ 11/11] src/plugin: fix " Ismagil Iskakov
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=20250708073334.2393559-4-i.iskakov@omp.ru \
--to=i.iskakov@omp.ru \
--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