| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <44119dc8-5e17-b27d-75f2-80f590728604@redhat.com>
Date: Fri, 19 Aug 2022 10:57:53 +0200
From: Hans de Goede <hdegoede@...hat.com>
To: Andy Shevchenko <andy.shevchenko@...il.com>,
Wolfram Sang <wsa+renesas@...g-engineering.com>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Mark Gross <markgross@...nel.org>,
Maximilian Luz <luzmaximilian@...il.com>,
Divya Bharathi <divya.bharathi@...l.com>,
Prasanth Ksr <prasanth.ksr@...l.com>,
Henrique de Moraes Holschuh <hmh@....eng.br>,
Platform Driver <platform-driver-x86@...r.kernel.org>,
Dell.Client.Kernel@...l.com,
Thinkpad-acpi devel ML <ibm-acpi-devel@...ts.sourceforge.net>
Subject: Re: [PATCH] platform: move from strlcpy with unused retval to strscpy
Hi,
On 8/19/22 08:22, Andy Shevchenko wrote:
> On Fri, Aug 19, 2022 at 12:06 AM Wolfram Sang
> <wsa+renesas@...g-engineering.com> wrote:
>>
>> Follow the advice of the below link and prefer 'strscpy' in this
>
> We refer to the functions like this: strscpy() (note no quote marks).
>
>> subsystem. Conversion is 1:1 because the return value is not used.
>> Generated by a coccinelle script.
>
> I assume you are experimenting with coccinelle, so I have no objection
> to the change, but in PDx86 we usually want to have one patch per
> driver. Can you split?
Actually, although we do in general split patches per driver
as Andy says, this one is so small / simple that I'm happy to
merge it as is. I'll pick this up during my next round of
merges coming Monday.
> You also may add
> Reviewed-by: Andy Shevchenko <andy.shevchenko@...il.com>
Thanks for the review.
Regards,
Hans
> to each of them.
>
>> Link: https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@mail.gmail.com/
>> Signed-off-by: Wolfram Sang <wsa+renesas@...g-engineering.com>
>> ---
>> drivers/platform/surface/surface3_power.c | 2 +-
>> drivers/platform/x86/dell/dell-wmi-sysman/sysman.c | 2 +-
>> drivers/platform/x86/intel/chtwc_int33fe.c | 6 +++---
>> drivers/platform/x86/thinkpad_acpi.c | 4 ++--
>> 4 files changed, 7 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/platform/surface/surface3_power.c b/drivers/platform/surface/surface3_power.c
>> index 444ec81ba02d..4c53d116d59b 100644
>> --- a/drivers/platform/surface/surface3_power.c
>> +++ b/drivers/platform/surface/surface3_power.c
>> @@ -519,7 +519,7 @@ static int mshw0011_probe(struct i2c_client *client)
>> i2c_set_clientdata(client, data);
>>
>> memset(&board_info, 0, sizeof(board_info));
>> - strlcpy(board_info.type, "MSHW0011-bat0", I2C_NAME_SIZE);
>> + strscpy(board_info.type, "MSHW0011-bat0", I2C_NAME_SIZE);
>>
>> bat0 = i2c_acpi_new_device(dev, 1, &board_info);
>> if (IS_ERR(bat0))
>> diff --git a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c b/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
>> index 636bdfa83284..0a6411a8a104 100644
>> --- a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
>> +++ b/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
>> @@ -270,7 +270,7 @@ void strlcpy_attr(char *dest, char *src)
>> size_t len = strlen(src) + 1;
>>
>> if (len > 1 && len <= MAX_BUFF)
>> - strlcpy(dest, src, len);
>> + strscpy(dest, src, len);
>>
>> /*len can be zero because any property not-applicable to attribute can
>> * be empty so check only for too long buffers and log error
>> diff --git a/drivers/platform/x86/intel/chtwc_int33fe.c b/drivers/platform/x86/intel/chtwc_int33fe.c
>> index c52ac23e2331..1ea989df513c 100644
>> --- a/drivers/platform/x86/intel/chtwc_int33fe.c
>> +++ b/drivers/platform/x86/intel/chtwc_int33fe.c
>> @@ -270,7 +270,7 @@ cht_int33fe_register_max17047(struct device *dev, struct cht_int33fe_data *data)
>> }
>>
>> memset(&board_info, 0, sizeof(board_info));
>> - strlcpy(board_info.type, "max17047", I2C_NAME_SIZE);
>> + strscpy(board_info.type, "max17047", I2C_NAME_SIZE);
>> board_info.dev_name = "max17047";
>> board_info.fwnode = fwnode;
>> data->battery_fg = i2c_acpi_new_device(dev, 1, &board_info);
>> @@ -361,7 +361,7 @@ static int cht_int33fe_typec_probe(struct platform_device *pdev)
>> }
>>
>> memset(&board_info, 0, sizeof(board_info));
>> - strlcpy(board_info.type, "typec_fusb302", I2C_NAME_SIZE);
>> + strscpy(board_info.type, "typec_fusb302", I2C_NAME_SIZE);
>> board_info.dev_name = "fusb302";
>> board_info.fwnode = fwnode;
>> board_info.irq = fusb302_irq;
>> @@ -381,7 +381,7 @@ static int cht_int33fe_typec_probe(struct platform_device *pdev)
>> memset(&board_info, 0, sizeof(board_info));
>> board_info.dev_name = "pi3usb30532";
>> board_info.fwnode = fwnode;
>> - strlcpy(board_info.type, "pi3usb30532", I2C_NAME_SIZE);
>> + strscpy(board_info.type, "pi3usb30532", I2C_NAME_SIZE);
>>
>> data->pi3usb30532 = i2c_acpi_new_device(dev, 3, &board_info);
>> if (IS_ERR(data->pi3usb30532)) {
>> diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
>> index 22d4e8633e30..8dad0428a83c 100644
>> --- a/drivers/platform/x86/thinkpad_acpi.c
>> +++ b/drivers/platform/x86/thinkpad_acpi.c
>> @@ -7623,9 +7623,9 @@ static int __init volume_create_alsa_mixer(void)
>> data = card->private_data;
>> data->card = card;
>>
>> - strlcpy(card->driver, TPACPI_ALSA_DRVNAME,
>> + strscpy(card->driver, TPACPI_ALSA_DRVNAME,
>> sizeof(card->driver));
>> - strlcpy(card->shortname, TPACPI_ALSA_SHRTNAME,
>> + strscpy(card->shortname, TPACPI_ALSA_SHRTNAME,
>> sizeof(card->shortname));
>> snprintf(card->mixername, sizeof(card->mixername), "ThinkPad EC %s",
>> (thinkpad_id.ec_version_str) ?
>> --
>> 2.35.1
>>
>
>
Powered by blists - more mailing lists