[v3,1/1] Bluetooth: ISO: Copy BASE if service data matches EIR_BAA_SERVICE_UUID

Commit Message

Claudia Draghicescu Sept. 28, 2023, 8:02 a.m. UTC

Copy the content of a Periodic Advertisement Report to BASE only if
the service UUID is Basic Audio Announcement Service UUID.

Signed-off-by: Claudia Draghicescu <[e-mail]>
---
 net/bluetooth/iso.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

--
2.34.1

Comments

[e-mail] Sept. 28, 2023, 8:44 a.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=788382

---Test result---

Test Summary:
CheckPatch                    PASS      0.65 seconds
GitLint                       PASS      0.25 seconds
SubjectPrefix                 PASS      0.07 seconds
BuildKernel                   PASS      40.58 seconds
CheckAllWarning               PASS      44.55 seconds
CheckSparse                   PASS      50.68 seconds
CheckSmatch                   PASS      135.91 seconds
BuildKernel32                 PASS      39.58 seconds
TestRunnerSetup               PASS      594.11 seconds
TestRunner_l2cap-tester       PASS      35.07 seconds
TestRunner_iso-tester         PASS      68.93 seconds
TestRunner_bnep-tester        PASS      12.57 seconds
TestRunner_mgmt-tester        PASS      251.29 seconds
TestRunner_rfcomm-tester      PASS      18.89 seconds
TestRunner_sco-tester         PASS      21.87 seconds
TestRunner_ioctl-tester       PASS      21.58 seconds
TestRunner_mesh-tester        PASS      15.72 seconds
TestRunner_smp-tester         PASS      16.76 seconds
TestRunner_userchan-tester    PASS      13.24 seconds
IncrementalBuild              PASS      36.76 seconds



---
Regards,
Linux Bluetooth

Patch

diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c
index 2132a16be93c..4f23b3a35faf 100644
--- a/net/bluetooth/iso.c
+++ b/net/bluetooth/iso.c
@@ -14,6 +14,7 @@ 
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
 #include <net/bluetooth/iso.h>
+#include "eir.h"

 static const struct proto_ops iso_sock_ops;

@@ -47,6 +48,7 @@  static void iso_sock_kill(struct sock *sk);

 #define EIR_SERVICE_DATA_LENGTH 4
 #define BASE_MAX_LENGTH (HCI_MAX_PER_AD_LENGTH - EIR_SERVICE_DATA_LENGTH)
+#define EIR_BAA_SERVICE_UUID	0x1851

 /* iso_pinfo flags values */
 enum {
@@ -1461,6 +1463,8 @@  static int iso_sock_getsockopt(struct socket *sock, int level, int optname,
 		len = min_t(unsigned int, len, base_len);
 		if (copy_to_user(optval, base, len))
 			err = -EFAULT;
+		if (put_user(len, optlen))
+			err = -EFAULT;

 		break;

@@ -1783,12 +1787,18 @@  int iso_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 *flags)

 	ev3 = hci_recv_event_data(hdev, HCI_EV_LE_PER_ADV_REPORT);
 	if (ev3) {
+		size_t base_len = ev3->length;
+		u8 *base;
+
 		sk = iso_get_sock_listen(&hdev->bdaddr, bdaddr,
 					 iso_match_sync_handle_pa_report, ev3);
-
-		if (sk) {
-			memcpy(iso_pi(sk)->base, ev3->data, ev3->length);
-			iso_pi(sk)->base_len = ev3->length;
+		base = eir_get_service_data(ev3->data, ev3->length,
+					    EIR_BAA_SERVICE_UUID, &base_len);
+		if (base) {
+			if (sk) {
+				memcpy(iso_pi(sk)->base, base, base_len);
+				iso_pi(sk)->base_len = base_len;
+			}
 		}
 	} else {
 		sk = iso_get_sock_listen(&hdev->bdaddr, BDADDR_ANY, NULL, NULL);