nvme: fix possible deadlock when nvme_update_formats fails

[linux.git] / net / bluetooth / mgmt.c

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 150114e33b20f22c6da3bc25d4a2b9a7ffa5f81e..acb7c6d5643fe20c59f199723b55a66b8715091f 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2588,7 +2588,6 @@ static int get_connections(struct sock *sk, struct hci_dev *hdev, void *data,
 {
        struct mgmt_rp_get_connections *rp;
        struct hci_conn *c;
-       size_t rp_len;
        int err;
        u16 i;
 
@@ -2608,8 +2607,7 @@ static int get_connections(struct sock *sk, struct hci_dev *hdev, void *data,
                        i++;
        }
 
-       rp_len = sizeof(*rp) + (i * sizeof(struct mgmt_addr_info));
-       rp = kmalloc(rp_len, GFP_KERNEL);
+       rp = kmalloc(struct_size(rp, addr, i), GFP_KERNEL);
        if (!rp) {
                err = -ENOMEM;
                goto unlock;
@@ -2629,10 +2627,8 @@ static int get_connections(struct sock *sk, struct hci_dev *hdev, void *data,
        rp->conn_count = cpu_to_le16(i);
 
        /* Recalculate length in case of filtered SCO connections, etc */
-       rp_len = sizeof(*rp) + (i * sizeof(struct mgmt_addr_info));
-
        err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_GET_CONNECTIONS, 0, rp,
-                               rp_len);
+                               struct_size(rp, addr, i));
 
        kfree(rp);