2022-01-20 21:29:09

by Kees Cook

Subject: [PATCH -next] eeprom: at25: Replace strncpy() with strscpy()

Use strscpy() instead of strncpy(), since its use has been deprecated[1].

[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings

Cc: Greg Kroah-Hartman <[email protected]>
Cc: Andy Shevchenko <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: Jiri Prchal <[email protected]>
Signed-off-by: Kees Cook <[email protected]>
---
drivers/misc/eeprom/at25.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/misc/eeprom/at25.c b/drivers/misc/eeprom/at25.c
index bee727ed98db..91f96abbb3f9 100644
--- a/drivers/misc/eeprom/at25.c
+++ b/drivers/misc/eeprom/at25.c
@@ -309,7 +309,7 @@ static int at25_fw_to_chip(struct device *dev, struct spi_eeprom *chip)
u32 val;
int err;

- strncpy(chip->name, "at25", sizeof(chip->name));
+ strscpy(chip->name, "at25", sizeof(chip->name));

err = device_property_read_u32(dev, "size", &val);
if (err)
@@ -370,7 +370,7 @@ static int at25_fram_to_chip(struct device *dev, struct spi_eeprom *chip)
u8 id[FM25_ID_LEN];
int i;

- strncpy(chip->name, "fm25", sizeof(chip->name));
+ strscpy(chip->name, "fm25", sizeof(chip->name));

/* Get ID of chip */
fm25_aux_read(at25, id, FM25_RDID, FM25_ID_LEN);
--
2.30.2

2022-01-26 22:35:40

by Ralph Siemsen

Subject: Re: [PATCH -next] eeprom: at25: Replace strncpy() with strscpy()

Hi Kees,

On Tue, Jan 18, 2022 at 10:20:47AM -0800, Kees Cook wrote:
>Use strscpy() instead of strncpy(), since its use has been deprecated[1].
>
>[1]
>https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings

Along with your other fix to restore the missing kzalloc(), I tested
this change on 32-bit arm system, and it worked as expected.

Tested-by: Ralph Siemsen <[email protected]>

Cheers,
-Ralph

2022-01-26 22:37:21

by Kees Cook

Subject: Re: [PATCH -next] eeprom: at25: Replace strncpy() with strscpy()

On Wed, Jan 26, 2022 at 02:48:39PM -0500, Ralph Siemsen wrote:
> Hi Kees,
>
> On Tue, Jan 18, 2022 at 10:20:47AM -0800, Kees Cook wrote:
> > Use strscpy() instead of strncpy(), since its use has been deprecated[1].
> >
> > [1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings
>
> Along with your other fix to restore the missing kzalloc(), I tested this
> change on 32-bit arm system, and it worked as expected.
>
> Tested-by: Ralph Siemsen <[email protected]>

Thanks!

--
Kees Cook