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=v6a6g1ouzcprm...@mail.gmail.com/
Signed-off-by: Wolfram Sang <wsa+rene...@sang-engineering.com>
---
 arch/powerpc/kernel/dt_cpu_ftrs.c          | 2 +-
 arch/powerpc/platforms/powernv/idle.c      | 2 +-
 arch/powerpc/platforms/powernv/pci-ioda.c  | 2 +-
 arch/powerpc/platforms/pseries/hvcserver.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/kernel/dt_cpu_ftrs.c 
b/arch/powerpc/kernel/dt_cpu_ftrs.c
index fc800a9fb2c4..c3fb9fdf5bd7 100644
--- a/arch/powerpc/kernel/dt_cpu_ftrs.c
+++ b/arch/powerpc/kernel/dt_cpu_ftrs.c
@@ -1099,7 +1099,7 @@ static int __init dt_cpu_ftrs_scan_callback(unsigned long 
node, const char
 
        prop = of_get_flat_dt_prop(node, "display-name", NULL);
        if (prop && strlen((char *)prop) != 0) {
-               strlcpy(dt_cpu_name, (char *)prop, sizeof(dt_cpu_name));
+               strscpy(dt_cpu_name, (char *)prop, sizeof(dt_cpu_name));
                cur_cpu_spec->cpu_name = dt_cpu_name;
        }
 
diff --git a/arch/powerpc/platforms/powernv/idle.c 
b/arch/powerpc/platforms/powernv/idle.c
index 6f94b808dd39..6e6b3bd9c92f 100644
--- a/arch/powerpc/platforms/powernv/idle.c
+++ b/arch/powerpc/platforms/powernv/idle.c
@@ -1411,7 +1411,7 @@ static int __init pnv_parse_cpuidle_dt(void)
                goto out;
        }
        for (i = 0; i < nr_idle_states; i++)
-               strlcpy(pnv_idle_states[i].name, temp_string[i],
+               strscpy(pnv_idle_states[i].name, temp_string[i],
                        PNV_IDLE_NAME_LEN);
        nr_pnv_idle_states = nr_idle_states;
        rc = 0;
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c 
b/arch/powerpc/platforms/powernv/pci-ioda.c
index 9de9b2fb163d..5c144c05cbfd 100644
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -67,7 +67,7 @@ void pe_level_printk(const struct pnv_ioda_pe *pe, const char 
*level,
        vaf.va = &args;
 
        if (pe->flags & PNV_IODA_PE_DEV)
-               strlcpy(pfix, dev_name(&pe->pdev->dev), sizeof(pfix));
+               strscpy(pfix, dev_name(&pe->pdev->dev), sizeof(pfix));
        else if (pe->flags & (PNV_IODA_PE_BUS | PNV_IODA_PE_BUS_ALL))
                sprintf(pfix, "%04x:%02x     ",
                        pci_domain_nr(pe->pbus), pe->pbus->number);
diff --git a/arch/powerpc/platforms/pseries/hvcserver.c 
b/arch/powerpc/platforms/pseries/hvcserver.c
index 96e18d3b2fcf..d48c9c7ce10f 100644
--- a/arch/powerpc/platforms/pseries/hvcserver.c
+++ b/arch/powerpc/platforms/pseries/hvcserver.c
@@ -176,7 +176,7 @@ int hvcs_get_partner_info(uint32_t unit_address, struct 
list_head *head,
                        = (unsigned int)last_p_partition_ID;
 
                /* copy the Null-term char too */
-               strlcpy(&next_partner_info->location_code[0],
+               strscpy(&next_partner_info->location_code[0],
                        (char *)&pi_buff[2],
                        sizeof(next_partner_info->location_code));
 
-- 
2.35.1

Reply via email to