[BlueZ,1/5] shared/bap: Handle NULL caps at bis verify

Commit Message

Iulia Tanasescu May 17, 2024, 12:34 p.m. UTC

This updates bt_bap_verify_bis to handle NULL L2 and/or L3 caps.
---
 src/shared/bap.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

Comments

[e-mail] May 17, 2024, 4:03 p.m. UTC | #1

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=853984

---Test result---

Test Summary:
CheckPatch                    PASS      3.36 seconds
GitLint                       PASS      1.73 seconds
BuildEll                      PASS      24.25 seconds
BluezMake                     PASS      1748.84 seconds
MakeCheck                     PASS      13.18 seconds
MakeDistcheck                 PASS      181.70 seconds
CheckValgrind                 PASS      254.18 seconds
CheckSmatch                   WARNING   353.25 seconds
bluezmakeextell               PASS      122.98 seconds
IncrementalBuild              PASS      7837.32 seconds
ScanBuild                     PASS      998.38 seconds

Details
##############################
Test: CheckSmatch - WARNING
Desc: Run smatch tool with source
Output:
src/shared/bap.c:286:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:286:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:286:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:286:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:286:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:286:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structures


---
Regards,
Linux Bluetooth

Patch

diff --git a/src/shared/bap.c b/src/shared/bap.c
index 38c353a6d..40ce16d75 100644
--- a/src/shared/bap.c
+++ b/src/shared/bap.c
@@ -6531,6 +6531,20 @@  void bt_bap_verify_bis(struct bt_bap *bap, uint8_t bis_index,
 	struct bt_ltv_extract merge_data = {0};
 	struct bt_ltv_match match_data;
 
+	if (!l2_caps)
+		/* Codec_Specific_Configuration parameters shall
+		 * be present at Level 2.
+		 */
+		return;
+
+	if (!l3_caps) {
+		/* Codec_Specific_Configuration parameters may
+		 * be present at Level 3.
+		 */
+		merge_data.result = util_iov_dup(l2_caps, 1);
+		goto done;
+	}
+
 	merge_data.src = l3_caps;
 	merge_data.result = new0(struct iovec, 1);
 
@@ -6542,6 +6556,7 @@  void bt_bap_verify_bis(struct bt_bap *bap, uint8_t bis_index,
 			NULL,
 			bap_sink_check_level2_ltv, &merge_data);
 
+done:
 	/* Check each BIS Codec Specific Configuration LTVs against our Codec
 	 * Specific Capabilities and if the BIS matches create a PAC with it
 	 */