2022-08-18 21:12:42

by Wolfram Sang

[permalink] [raw]
Subject: [PATCH] Bluetooth: move from strlcpy with unused retval to strscpy

Follow the advice of the below link and prefer 'strscpy' in this
subsystem. Conversion is 1:1 because the return value is not used.
Generated by a coccinelle script.

Link: https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@mail.gmail.com/
Signed-off-by: Wolfram Sang <[email protected]>
---
net/bluetooth/hidp/core.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index 5940744a8cd8..cc20e706c639 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -83,14 +83,14 @@ static void hidp_copy_session(struct hidp_session *session, struct hidp_conninfo
ci->product = session->input->id.product;
ci->version = session->input->id.version;
if (session->input->name)
- strlcpy(ci->name, session->input->name, 128);
+ strscpy(ci->name, session->input->name, 128);
else
- strlcpy(ci->name, "HID Boot Device", 128);
+ strscpy(ci->name, "HID Boot Device", 128);
} else if (session->hid) {
ci->vendor = session->hid->vendor;
ci->product = session->hid->product;
ci->version = session->hid->version;
- strlcpy(ci->name, session->hid->name, 128);
+ strscpy(ci->name, session->hid->name, 128);
}
}

--
2.35.1


2022-08-18 22:06:41

by bluez.test.bot

[permalink] [raw]
Subject: RE: Bluetooth: move from strlcpy with unused retval to strscpy

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

---Test result---

Test Summary:
CheckPatch PASS 1.57 seconds
GitLint FAIL 0.97 seconds
SubjectPrefix PASS 0.85 seconds
BuildKernel PASS 33.52 seconds
BuildKernel32 PASS 29.27 seconds
Incremental Build with patchesPASS 42.62 seconds
TestRunner: Setup PASS 488.32 seconds
TestRunner: l2cap-tester PASS 17.56 seconds
TestRunner: bnep-tester PASS 6.84 seconds
TestRunner: mgmt-tester PASS 104.32 seconds
TestRunner: rfcomm-tester PASS 10.07 seconds
TestRunner: sco-tester PASS 9.98 seconds
TestRunner: smp-tester PASS 9.98 seconds
TestRunner: userchan-tester PASS 6.99 seconds

Details
##############################
Test: GitLint - FAIL - 0.97 seconds
Run gitlint with rule in .gitlint
Bluetooth: move from strlcpy with unused retval to strscpy
7: B1 Line exceeds max length (99>80): "Link: https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@mail.gmail.com/"




---
Regards,
Linux Bluetooth

2022-08-18 22:10:20

by Luiz Augusto von Dentz

[permalink] [raw]
Subject: Re: [PATCH] Bluetooth: move from strlcpy with unused retval to strscpy

Hi Wolfram,

On Thu, Aug 18, 2022 at 2:05 PM Wolfram Sang
<[email protected]> wrote:
>
> Follow the advice of the below link and prefer 'strscpy' in this
> subsystem. Conversion is 1:1 because the return value is not used.
> Generated by a coccinelle script.

The link below doesn't seem to work.

> Link: https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@mail.gmail.com/
> Signed-off-by: Wolfram Sang <[email protected]>
> ---
> net/bluetooth/hidp/core.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
> index 5940744a8cd8..cc20e706c639 100644
> --- a/net/bluetooth/hidp/core.c
> +++ b/net/bluetooth/hidp/core.c
> @@ -83,14 +83,14 @@ static void hidp_copy_session(struct hidp_session *session, struct hidp_conninfo
> ci->product = session->input->id.product;
> ci->version = session->input->id.version;
> if (session->input->name)
> - strlcpy(ci->name, session->input->name, 128);
> + strscpy(ci->name, session->input->name, 128);
> else
> - strlcpy(ci->name, "HID Boot Device", 128);
> + strscpy(ci->name, "HID Boot Device", 128);
> } else if (session->hid) {
> ci->vendor = session->hid->vendor;
> ci->product = session->hid->product;
> ci->version = session->hid->version;
> - strlcpy(ci->name, session->hid->name, 128);
> + strscpy(ci->name, session->hid->name, 128);
> }
> }
>
> --
> 2.35.1
>


--
Luiz Augusto von Dentz

2022-08-18 22:10:31

by Randy Dunlap

[permalink] [raw]
Subject: Re: [PATCH] Bluetooth: move from strlcpy with unused retval to strscpy



On 8/18/22 15:07, Luiz Augusto von Dentz wrote:
> Hi Wolfram,
>
> On Thu, Aug 18, 2022 at 2:05 PM Wolfram Sang
> <[email protected]> wrote:
>>
>> Follow the advice of the below link and prefer 'strscpy' in this
>> subsystem. Conversion is 1:1 because the return value is not used.
>> Generated by a coccinelle script.
>
> The link below doesn't seem to work.

Works for me.

>> Link: https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@mail.gmail.com/
>> Signed-off-by: Wolfram Sang <[email protected]>
>> ---
>> net/bluetooth/hidp/core.c | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
>> index 5940744a8cd8..cc20e706c639 100644
>> --- a/net/bluetooth/hidp/core.c
>> +++ b/net/bluetooth/hidp/core.c
>> @@ -83,14 +83,14 @@ static void hidp_copy_session(struct hidp_session *session, struct hidp_conninfo
>> ci->product = session->input->id.product;
>> ci->version = session->input->id.version;
>> if (session->input->name)
>> - strlcpy(ci->name, session->input->name, 128);
>> + strscpy(ci->name, session->input->name, 128);
>> else
>> - strlcpy(ci->name, "HID Boot Device", 128);
>> + strscpy(ci->name, "HID Boot Device", 128);
>> } else if (session->hid) {
>> ci->vendor = session->hid->vendor;
>> ci->product = session->hid->product;
>> ci->version = session->hid->version;
>> - strlcpy(ci->name, session->hid->name, 128);
>> + strscpy(ci->name, session->hid->name, 128);
>> }
>> }
>>
>> --
>> 2.35.1
>>
>
>

--
~Randy

2022-08-24 22:37:43

by patchwork-bot+bluetooth

[permalink] [raw]
Subject: Re: [PATCH] Bluetooth: move from strlcpy with unused retval to strscpy

Hello:

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

On Thu, 18 Aug 2022 23:02:07 +0200 you wrote:
> Follow the advice of the below link and prefer 'strscpy' in this
> subsystem. Conversion is 1:1 because the return value is not used.
> Generated by a coccinelle script.
>
> Link: https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@mail.gmail.com/
> Signed-off-by: Wolfram Sang <[email protected]>
>
> [...]

Here is the summary with links:
- Bluetooth: move from strlcpy with unused retval to strscpy
https://git.kernel.org/bluetooth/bluetooth-next/c/5cc684fb4f0f

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