Bluetooth: ISO: Fix not using the correct QoS
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH 1/1 Bluetooth: ISO: Fix not using the correct QoS
From: Luiz Augusto von Dentz <[email protected]>
This fixes using wrong QoS settings when attempting to send frames while acting as peripheral since the QoS settings in use are stored in hconn->iso_qos not in sk->qos, this is actually properly handled on getsockopt(BT_ISO_QOS) but not on iso_send_frame.
--- net/bluetooth/iso.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
net/bluetooth/iso.c +11 -5
@@ -373,15 +373,24 @@ static int iso_connect_cis(struct sock *sk)return err; } +static struct bt_iso_qos *iso_sock_get_qos (struct sock *sk) +{ +if (sk->sk_state ==BT_CONNECTED || sk->sk_state ==BT_CONNECT2 ) +return &iso_pi (sk)->conn->hcon->iso_qos; + +return &iso_pi (sk)->qos; +} +static int iso_send_frame (struct sock *sk,struct sk_buff *skb) {struct iso_conn *conn =iso_pi (sk)->conn; +struct bt_iso_qos *qos =iso_sock_get_qos (sk);struct hci_iso_data_hdr *hdr;int len =0 ;BT_DBG ("sk %p len %d" , sk, skb->len); -if (skb->len >iso_pi (sk)->qos.out.sdu) +if (skb->len > qos->out.sdu)return -EMSGSIZE ; len = skb->len;
@@ -1263,10 +1272,7 @@ static int iso_sock_getsockopt(struct socket *sock, int level, int optname,break ;case BT_ISO_QOS : -if (sk->sk_state ==BT_CONNECTED || sk->sk_state ==BT_CONNECT2 ) - qos = &iso_pi (sk)->conn->hcon->iso_qos; -else - qos = &iso_pi (sk)->qos; + qos =iso_sock_get_qos (sk); len = min_t(unsigned int, len, sizeof(*qos));if (copy_to_user (optval, qos, len))
Signature · 1 line
2.37.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=665768
---Test result---
Test Summary:
CheckPatch PASS 1.66 seconds GitLint PASS 0.98 seconds SubjectPrefix PASS 0.86 seconds BuildKernel PASS 33.33 seconds BuildKernel32 PASS 28.61 seconds Incremental Build with patchesPASS 41.02 seconds TestRunner: Setup PASS 478.76 seconds TestRunner: l2cap-tester PASS 16.98 seconds TestRunner: bnep-tester PASS 6.29 seconds TestRunner: mgmt-tester PASS 99.96 seconds TestRunner: rfcomm-tester PASS 9.65 seconds TestRunner: sco-tester PASS 9.32 seconds TestRunner: smp-tester PASS 9.42 seconds TestRunner: userchan-tester PASS 6.50 seconds
---
Regards,
Linux Bluetooth
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 8 lines · On Fri, 5 Aug 2022 14:56:01 -0700 you wrote:
From: Luiz Augusto von Dentz <[email protected]>
This fixes using wrong QoS settings when attempting to send frames while acting as peripheral since the QoS settings in use are stored in
hconn->iso_qosnot insk->qos, this is actually properly handled ongetsockopt(BT_ISO_QOS)but not oniso_send_frame.[...]
Here is the summary with links:
- Bluetooth: ISO: Fix not using the correct QoS
https://git.kernel.org/bluetooth/bluetooth-next/c/aac59090a068
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html