[PATCH linux-next] Bluetooth: hci_conn:Use kzalloc instead of kmalloc/memset

[PATCH linux-next] Bluetooth: hci_conn:Use kzalloc instead of kmalloc/memset

[cgel.zte]

From: ye xingchen <ye.xingchen@zte.com.cn>

From the coccinelle check:

./net/bluetooth/hci_conn.c
WARNING  kzalloc should be used for d, instead of kmalloc/memset

Use kzalloc rather than duplicating its implementation, which
makes code simple and easy to understand.

Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: ye xingchen <ye.xingchen@zte.com.cn>
---
 net/bluetooth/hci_conn.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 337e74d0f8b1..184c790af045 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -824,11 +824,10 @@ static int hci_le_terminate_big(struct hci_dev *hdev, u8 big, u8 bis)
 
 	bt_dev_dbg(hdev, "big 0x%2.2x bis 0x%2.2x", big, bis);
 
-	d = kmalloc(sizeof(*d), GFP_KERNEL);
+	d = kzalloc(sizeof(*d), GFP_KERNEL);
 	if (!d)
 		return -ENOMEM;
 
-	memset(d, 0, sizeof(*d));
 	d->big = big;
 	d->bis = bis;
 
@@ -861,11 +860,10 @@ static int hci_le_big_terminate(struct hci_dev *hdev, u8 big, u16 sync_handle)
 
 	bt_dev_dbg(hdev, "big 0x%2.2x sync_handle 0x%4.4x", big, sync_handle);
 
-	d = kmalloc(sizeof(*d), GFP_KERNEL);
+	d = kzalloc(sizeof(*d), GFP_KERNEL);
 	if (!d)
 		return -ENOMEM;
 
-	memset(d, 0, sizeof(*d));
 	d->big = big;
 	d->sync_handle = sync_handle;
 
@@ -2034,7 +2032,7 @@ int hci_pa_create_sync(struct hci_dev *hdev, bdaddr_t *dst, __u8 dst_type,
 	if (hci_dev_test_and_set_flag(hdev, HCI_PA_SYNC))
 		return -EBUSY;
 
-	cp = kmalloc(sizeof(*cp), GFP_KERNEL);
+	cp = kzalloc(sizeof(*cp), GFP_KERNEL);
 	if (!cp) {
 		hci_dev_clear_flag(hdev, HCI_PA_SYNC);
 		return -ENOMEM;
@@ -2046,7 +2044,6 @@ int hci_pa_create_sync(struct hci_dev *hdev, bdaddr_t *dst, __u8 dst_type,
 	else
 		dst_type = ADDR_LE_DEV_RANDOM;
 
-	memset(cp, 0, sizeof(*cp));
 	cp->sid = sid;
 	cp->addr_type = dst_type;
 	bacpy(&cp->addr, dst);
-- 
2.25.1

Re: [PATCH linux-next] Bluetooth: hci_conn:Use kzalloc instead of kmalloc/memset

[Luiz Augusto von Dentz]

Hi,

On Sun, Aug 14, 2022 at 8:13 PM <cgel.zte@gmail.com> wrote:
>
> From: ye xingchen <ye.xingchen@zte.com.cn>
>
> From the coccinelle check:
>
> ./net/bluetooth/hci_conn.c
> WARNING  kzalloc should be used for d, instead of kmalloc/memset
>
> Use kzalloc rather than duplicating its implementation, which
> makes code simple and easy to understand.

Would you please add Fixes tag since we probably want to apply to rc series.


> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: ye xingchen <ye.xingchen@zte.com.cn>
> ---
>  net/bluetooth/hci_conn.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
> index 337e74d0f8b1..184c790af045 100644
> --- a/net/bluetooth/hci_conn.c
> +++ b/net/bluetooth/hci_conn.c
> @@ -824,11 +824,10 @@ static int hci_le_terminate_big(struct hci_dev *hdev, u8 big, u8 bis)
>
>         bt_dev_dbg(hdev, "big 0x%2.2x bis 0x%2.2x", big, bis);
>
> -       d = kmalloc(sizeof(*d), GFP_KERNEL);
> +       d = kzalloc(sizeof(*d), GFP_KERNEL);
>         if (!d)
>                 return -ENOMEM;
>
> -       memset(d, 0, sizeof(*d));
>         d->big = big;
>         d->bis = bis;
>
> @@ -861,11 +860,10 @@ static int hci_le_big_terminate(struct hci_dev *hdev, u8 big, u16 sync_handle)
>
>         bt_dev_dbg(hdev, "big 0x%2.2x sync_handle 0x%4.4x", big, sync_handle);
>
> -       d = kmalloc(sizeof(*d), GFP_KERNEL);
> +       d = kzalloc(sizeof(*d), GFP_KERNEL);
>         if (!d)
>                 return -ENOMEM;
>
> -       memset(d, 0, sizeof(*d));
>         d->big = big;
>         d->sync_handle = sync_handle;
>
> @@ -2034,7 +2032,7 @@ int hci_pa_create_sync(struct hci_dev *hdev, bdaddr_t *dst, __u8 dst_type,
>         if (hci_dev_test_and_set_flag(hdev, HCI_PA_SYNC))
>                 return -EBUSY;
>
> -       cp = kmalloc(sizeof(*cp), GFP_KERNEL);
> +       cp = kzalloc(sizeof(*cp), GFP_KERNEL);
>         if (!cp) {
>                 hci_dev_clear_flag(hdev, HCI_PA_SYNC);
>                 return -ENOMEM;
> @@ -2046,7 +2044,6 @@ int hci_pa_create_sync(struct hci_dev *hdev, bdaddr_t *dst, __u8 dst_type,
>         else
>                 dst_type = ADDR_LE_DEV_RANDOM;
>
> -       memset(cp, 0, sizeof(*cp));
>         cp->sid = sid;
>         cp->addr_type = dst_type;
>         bacpy(&cp->addr, dst);
> --
> 2.25.1



--
Luiz Augusto von Dentz