2024-05-01 18:09:43

by Gustavo A. R. Silva

[permalink] [raw]
Subject: [PATCH][next] Bluetooth: hci_conn: Use struct_size() in hci_le_big_create_sync()

Use struct_size() instead of the open-coded version. Similarly to
this other patch[1].

Link: https://lore.kernel.org/linux-hardening/ZiwwPmCvU25YzWek@neat/ [1]
Signed-off-by: Gustavo A. R. Silva <[email protected]>
---
net/bluetooth/hci_conn.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index d6daf55f0307..c508609be105 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -2135,7 +2135,7 @@ int hci_le_big_create_sync(struct hci_dev *hdev, struct hci_conn *hcon,
memcpy(pdu->bis, bis, num_bis);

return hci_send_cmd(hdev, HCI_OP_LE_BIG_CREATE_SYNC,
- sizeof(*pdu) + num_bis, pdu);
+ struct_size(pdu, bis, num_bis), pdu);
}

static void create_big_complete(struct hci_dev *hdev, void *data, int err)
--
2.34.1



2024-05-01 18:35:13

by bluez.test.bot

[permalink] [raw]
Subject: RE: [next] Bluetooth: hci_conn: Use struct_size() in hci_le_big_create_sync()

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=849718

---Test result---

Test Summary:
CheckPatch PASS 0.48 seconds
GitLint PASS 0.20 seconds
SubjectPrefix PASS 0.08 seconds
BuildKernel PASS 29.44 seconds
CheckAllWarning PASS 32.23 seconds
CheckSparse PASS 37.69 seconds
CheckSmatch FAIL 35.29 seconds
BuildKernel32 PASS 28.38 seconds
TestRunnerSetup PASS 512.49 seconds
TestRunner_l2cap-tester PASS 20.20 seconds
TestRunner_iso-tester PASS 28.50 seconds
TestRunner_bnep-tester PASS 4.60 seconds
TestRunner_mgmt-tester PASS 110.62 seconds
TestRunner_rfcomm-tester PASS 7.23 seconds
TestRunner_sco-tester PASS 14.90 seconds
TestRunner_ioctl-tester PASS 7.57 seconds
TestRunner_mesh-tester PASS 5.69 seconds
TestRunner_smp-tester PASS 6.71 seconds
TestRunner_userchan-tester PASS 4.82 seconds
IncrementalBuild PASS 27.24 seconds

Details
##############################
Test: CheckSmatch - FAIL
Desc: Run smatch tool with source
Output:

Segmentation fault (core dumped)
make[4]: *** [scripts/Makefile.build:244: net/bluetooth/hci_core.o] Error 139
make[4]: *** Deleting file 'net/bluetooth/hci_core.o'
make[3]: *** [scripts/Makefile.build:485: net/bluetooth] Error 2
make[2]: *** [scripts/Makefile.build:485: net] Error 2
make[2]: *** Waiting for unfinished jobs....
Segmentation fault (core dumped)
make[4]: *** [scripts/Makefile.build:244: drivers/bluetooth/bcm203x.o] Error 139
make[4]: *** Deleting file 'drivers/bluetooth/bcm203x.o'
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [scripts/Makefile.build:485: drivers/bluetooth] Error 2
make[2]: *** [scripts/Makefile.build:485: drivers] Error 2
make[1]: *** [/github/workspace/src/src/Makefile:1919: .] Error 2
make: *** [Makefile:240: __sub-make] Error 2


---
Regards,
Linux Bluetooth

2024-05-01 19:13:06

by Kees Cook

[permalink] [raw]
Subject: Re: [PATCH][next] Bluetooth: hci_conn: Use struct_size() in hci_le_big_create_sync()

On Wed, May 01, 2024 at 12:09:30PM -0600, Gustavo A. R. Silva wrote:
> Use struct_size() instead of the open-coded version. Similarly to
> this other patch[1].
>
> Link: https://lore.kernel.org/linux-hardening/ZiwwPmCvU25YzWek@neat/ [1]
> Signed-off-by: Gustavo A. R. Silva <[email protected]>

Reviewed-by: Kees Cook <[email protected]>

--
Kees Cook

2024-05-01 20:01:06

by patchwork-bot+bluetooth

[permalink] [raw]
Subject: Re: [PATCH][next] Bluetooth: hci_conn: Use struct_size() in hci_le_big_create_sync()

Hello:

This patch was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <[email protected]>:

On Wed, 1 May 2024 12:09:30 -0600 you wrote:
> Use struct_size() instead of the open-coded version. Similarly to
> this other patch[1].
>
> Link: https://lore.kernel.org/linux-hardening/ZiwwPmCvU25YzWek@neat/ [1]
> Signed-off-by: Gustavo A. R. Silva <[email protected]>
> ---
> net/bluetooth/hci_conn.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

Here is the summary with links:
- [next] Bluetooth: hci_conn: Use struct_size() in hci_le_big_create_sync()
https://git.kernel.org/bluetooth/bluetooth-next/c/7bbc06151f36

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html