Merge tag 'net-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-microblaze.git] / net / bluetooth / iso.c

diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c
index ff09c35..ced8ad4 100644 (file)
--- a/net/bluetooth/iso.c
+++ b/net/bluetooth/iso.c
@@ -44,6 +44,9 @@ static void iso_sock_kill(struct sock *sk);
 /* ----- ISO socket info ----- */
 #define iso_pi(sk) ((struct iso_pinfo *)sk)
 
+#define EIR_SERVICE_DATA_LENGTH 4
+#define BASE_MAX_LENGTH (HCI_MAX_PER_AD_LENGTH - EIR_SERVICE_DATA_LENGTH)
+
 struct iso_pinfo {
        struct bt_sock          bt;
        bdaddr_t                src;
@@ -57,7 +60,7 @@ struct iso_pinfo {
        __u32                   flags;
        struct bt_iso_qos       qos;
        __u8                    base_len;
-       __u8                    base[HCI_MAX_PER_AD_LENGTH];
+       __u8                    base[BASE_MAX_LENGTH];
        struct iso_conn         *conn;
 };
 
@@ -370,15 +373,24 @@ done:
        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;
@@ -1177,8 +1189,10 @@ static int iso_sock_setsockopt(struct socket *sock, int level, int optname,
                }
 
                len = min_t(unsigned int, sizeof(qos), optlen);
-               if (len != sizeof(qos))
-                       return -EINVAL;
+               if (len != sizeof(qos)) {
+                       err = -EINVAL;
+                       break;
+               }
 
                memset(&qos, 0, sizeof(qos));
 
@@ -1233,7 +1247,7 @@ static int iso_sock_getsockopt(struct socket *sock, int level, int optname,
 {
        struct sock *sk = sock->sk;
        int len, err = 0;
-       struct bt_iso_qos qos;
+       struct bt_iso_qos *qos;
        u8 base_len;
        u8 *base;
 
@@ -1246,7 +1260,7 @@ static int iso_sock_getsockopt(struct socket *sock, int level, int optname,
 
        switch (optname) {
        case BT_DEFER_SETUP:
-               if (sk->sk_state != BT_BOUND && sk->sk_state != BT_LISTEN) {
+               if (sk->sk_state == BT_CONNECTED) {
                        err = -EINVAL;
                        break;
                }
@@ -1258,13 +1272,10 @@ 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, (char *)&qos, len))
+               len = min_t(unsigned int, len, sizeof(*qos));
+               if (copy_to_user(optval, qos, len))
                        err = -EFAULT;
 
                break;