Skip to content

Commit db5767e

Browse files
MariuszSkamracarlescufi
authored andcommitted
Bluetooth: audio: Accept empty CCID list in audio metadata
The CCID list can be empty, as the Assigned Numbers is not strict regarding it's minimum length. Fixes: #59666 Signed-off-by: Mariusz Skamra <[email protected]>
1 parent a32ba62 commit db5767e

File tree

7 files changed

+7
-42
lines changed

7 files changed

+7
-42
lines changed

samples/bluetooth/hap_ha/src/bap_unicast_sr.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -297,12 +297,7 @@ static bool valid_metadata_type(uint8_t type, uint8_t len)
297297
}
298298

299299
return true;
300-
case BT_AUDIO_METADATA_TYPE_CCID_LIST: /* 2 - 254 octets */
301-
if (len < 2) {
302-
return false;
303-
}
304-
305-
return true;
300+
case BT_AUDIO_METADATA_TYPE_CCID_LIST:
306301
case BT_AUDIO_METADATA_TYPE_PROGRAM_INFO: /* 0 - 255 octets */
307302
case BT_AUDIO_METADATA_TYPE_PROGRAM_INFO_URI: /* 0 - 255 octets */
308303
return true;

samples/bluetooth/tmap_peripheral/src/bap_unicast_sr.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -246,12 +246,7 @@ static bool valid_metadata_type(uint8_t type, uint8_t len)
246246
}
247247

248248
return true;
249-
case BT_AUDIO_METADATA_TYPE_CCID_LIST: /* 2 - 254 octets */
250-
if (len < 2) {
251-
return false;
252-
}
253-
254-
return true;
249+
case BT_AUDIO_METADATA_TYPE_CCID_LIST:
255250
case BT_AUDIO_METADATA_TYPE_PROGRAM_INFO: /* 0 - 255 octets */
256251
case BT_AUDIO_METADATA_TYPE_PROGRAM_INFO_URI: /* 0 - 255 octets */
257252
return true;

samples/bluetooth/unicast_audio_server/src/main.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -438,12 +438,7 @@ static bool valid_metadata_type(uint8_t type, uint8_t len)
438438
}
439439

440440
return true;
441-
case BT_AUDIO_METADATA_TYPE_CCID_LIST: /* 2 - 254 octets */
442-
if (len < 2) {
443-
return false;
444-
}
445-
446-
return true;
441+
case BT_AUDIO_METADATA_TYPE_CCID_LIST:
447442
case BT_AUDIO_METADATA_TYPE_PROGRAM_INFO: /* 0 - 255 octets */
448443
case BT_AUDIO_METADATA_TYPE_PROGRAM_INFO_URI: /* 0 - 255 octets */
449444
return true;

subsys/bluetooth/audio/shell/bap.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -518,12 +518,7 @@ static bool valid_metadata_type(uint8_t type, uint8_t len)
518518
}
519519

520520
return true;
521-
case BT_AUDIO_METADATA_TYPE_CCID_LIST: /* 2 - 254 octets */
522-
if (len < 2) {
523-
return false;
524-
}
525-
526-
return true;
521+
case BT_AUDIO_METADATA_TYPE_CCID_LIST:
527522
case BT_AUDIO_METADATA_TYPE_PROGRAM_INFO: /* 0 - 255 octets */
528523
case BT_AUDIO_METADATA_TYPE_PROGRAM_INFO_URI: /* 0 - 255 octets */
529524
return true;

tests/bluetooth/tester/src/btp_bap.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -360,12 +360,7 @@ static bool valid_metadata_type(uint8_t type, uint8_t len, const uint8_t *data)
360360
}
361361

362362
return true;
363-
case BT_AUDIO_METADATA_TYPE_CCID_LIST: /* 2 - 254 octets */
364-
if (len < 2) {
365-
return false;
366-
}
367-
368-
return true;
363+
case BT_AUDIO_METADATA_TYPE_CCID_LIST:
369364
case BT_AUDIO_METADATA_TYPE_PROGRAM_INFO: /* 0 - 255 octets */
370365
case BT_AUDIO_METADATA_TYPE_PROGRAM_INFO_URI: /* 0 - 255 octets */
371366
return true;

tests/bsim/bluetooth/audio/src/bap_unicast_server_test.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,12 +189,7 @@ static bool valid_metadata_type(uint8_t type, uint8_t len)
189189
}
190190

191191
return true;
192-
case BT_AUDIO_METADATA_TYPE_CCID_LIST: /* 2 - 254 octets */
193-
if (len < 2) {
194-
return false;
195-
}
196-
197-
return true;
192+
case BT_AUDIO_METADATA_TYPE_CCID_LIST:
198193
case BT_AUDIO_METADATA_TYPE_PROGRAM_INFO: /* 0 - 255 octets */
199194
case BT_AUDIO_METADATA_TYPE_PROGRAM_INFO_URI: /* 0 - 255 octets */
200195
return true;

tests/bsim/bluetooth/audio/src/cap_acceptor_test.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -354,12 +354,7 @@ static bool valid_metadata_type(uint8_t type, uint8_t len)
354354
}
355355

356356
return true;
357-
case BT_AUDIO_METADATA_TYPE_CCID_LIST: /* 2 - 254 octets */
358-
if (len < 2) {
359-
return false;
360-
}
361-
362-
return true;
357+
case BT_AUDIO_METADATA_TYPE_CCID_LIST:
363358
case BT_AUDIO_METADATA_TYPE_PROGRAM_INFO: /* 0 - 255 octets */
364359
case BT_AUDIO_METADATA_TYPE_PROGRAM_INFO_URI: /* 0 - 255 octets */
365360
return true;

0 commit comments

Comments
 (0)