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

From: Randy Dunlap
Date: Thu Aug 18 2022 - 18:10:07 EST




On 8/18/22 15:07, Luiz Augusto von Dentz wrote:
> Hi Wolfram,
>
> On Thu, Aug 18, 2022 at 2:05 PM Wolfram Sang
> <wsa+renesas@xxxxxxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxx/
>> Signed-off-by: Wolfram Sang <wsa+renesas@xxxxxxxxxxxxxxxxxxxx>
>> ---
>> 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