| Message ID | 20220818210207.8323-1-wsa+renesas@sang-engineering.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Bluetooth: move from strlcpy with unused retval to strscpy | expand |
Hi Wolfram, On Thu, Aug 18, 2022 at 2:05 PM Wolfram Sang <wsa+renesas@sang-engineering.com> 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 <wsa+renesas@sang-engineering.com> > --- > 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 >
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@sang-engineering.com> 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 <wsa+renesas@sang-engineering.com> >> --- >> 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 >> > >
Hello: This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>: 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 <wsa+renesas@sang-engineering.com> > > [...] 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!
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); } }
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 <wsa+renesas@sang-engineering.com> --- net/bluetooth/hidp/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)