Skip to contentSkip to conversation

Staging: acpi: fixed a coding style issue moving from strcpy to strscpy.

PATCH In review Thomas Andreatta 2 participants 2 messages Jul 5, 2024 – Jul 9, 2024 ACPI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: acpi: fixed a coding style issue moving from strcpy to strscpy.

fixed a coding style issue moving from strcpy to strscpy.

---
 drivers/acpi/ac.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/acpi/ac.c +5 -2
index 09a87fa222c7..f4b5ba033df8 100644
@@ -213,8 +213,11 @@ static int acpi_ac_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	ac->device = adev;
-	strcpy(acpi_device_name(adev), ACPI_AC_DEVICE_NAME);
-	strcpy(acpi_device_class(adev), ACPI_AC_CLASS);
+	char *device_class = acpi_device_class(adev);
+	char *device_name = acpi_device_name(adev);
+
+	strscpy(acpi_device_name(adev), ACPI_AC_DEVICE_NAME, strlen(device_name));
+	strscpy(device_class, ACPI_AC_CLASS, strlen(device_class));
 
 	platform_set_drvdata(pdev, ac);
 
Signature · 1 line
2.34.1
#1 lore raw
Quoted 2 lines · Thomas Andreatta

fixed a coding style issue moving from strcpy to strscpy.

This is not a coding style issue and the change below is not a fix.

It just replaces strcpy() with strscpy() which is preferred (for some reason that needs to be mentioned).

Quoted 10 lines
---
 drivers/acpi/ac.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/acpi/ac.c +0 -0
index 09a87fa222c7..f4b5ba033df8 100644

drivers/acpi/ac.c static int acpi_ac_probe(struct platform_device *pdev) · line 220

Quoted 10 lines
drivers/acpi/ac.c +5 -2
@@ -213,8 +213,11 @@ static int acpi_ac_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        ac->device = adev;
-       strcpy(acpi_device_name(adev), ACPI_AC_DEVICE_NAME);
-       strcpy(acpi_device_class(adev), ACPI_AC_CLASS);
+       char *device_class = acpi_device_class(adev);
+       char *device_name = acpi_device_name(adev);
+
+       strscpy(acpi_device_name(adev), ACPI_AC_DEVICE_NAME, strlen(device_name));
+       strscpy(device_class, ACPI_AC_CLASS, strlen(device_class));

The last argument of strscpy() is not necessary in both cases.

Quoted 4 lines
drivers/acpi/ac.c +0 -1
        platform_set_drvdata(pdev, ac);
 
--