Skip to content

Commit 72bb169

Browse files
GustavoARSilvaholtmann
authored andcommitted
Bluetooth: mgmt: Use struct_size() helper
One of the more common cases of allocation size calculations is finding the size of a structure that has a zero-sized array at the end, along with memory for some number of elements for that array. For example: struct mgmt_rp_get_connections { ... struct mgmt_addr_info addr[0]; } __packed; Make use of the struct_size() helper instead of an open-coded version in order to avoid any potential type mistakes. So, replace the following form: sizeof(*rp) + (i * sizeof(struct mgmt_addr_info)); with: struct_size(rp, addr, i) Also, notice that, in this case, variable rp_len is not necessary, hence it is removed. This code was detected with the help of Coccinelle. Signed-off-by: Gustavo A. R. Silva <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
1 parent f1300c0 commit 72bb169

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

net/bluetooth/mgmt.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2588,7 +2588,6 @@ static int get_connections(struct sock *sk, struct hci_dev *hdev, void *data,
25882588
{
25892589
struct mgmt_rp_get_connections *rp;
25902590
struct hci_conn *c;
2591-
size_t rp_len;
25922591
int err;
25932592
u16 i;
25942593

@@ -2608,8 +2607,7 @@ static int get_connections(struct sock *sk, struct hci_dev *hdev, void *data,
26082607
i++;
26092608
}
26102609

2611-
rp_len = sizeof(*rp) + (i * sizeof(struct mgmt_addr_info));
2612-
rp = kmalloc(rp_len, GFP_KERNEL);
2610+
rp = kmalloc(struct_size(rp, addr, i), GFP_KERNEL);
26132611
if (!rp) {
26142612
err = -ENOMEM;
26152613
goto unlock;
@@ -2629,10 +2627,8 @@ static int get_connections(struct sock *sk, struct hci_dev *hdev, void *data,
26292627
rp->conn_count = cpu_to_le16(i);
26302628

26312629
/* Recalculate length in case of filtered SCO connections, etc */
2632-
rp_len = sizeof(*rp) + (i * sizeof(struct mgmt_addr_info));
2633-
26342630
err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_GET_CONNECTIONS, 0, rp,
2635-
rp_len);
2631+
struct_size(rp, addr, i));
26362632

26372633
kfree(rp);
26382634

0 commit comments

Comments
 (0)