ASoC: intel: avs: refactor strncpy usage in topology
authorjustinstitt@google.com <justinstitt@google.com>
Tue, 25 Jul 2023 22:08:38 +0000 (22:08 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 26 Jul 2023 11:49:44 +0000 (12:49 +0100)
`strncpy` is deprecated for use on NUL-terminated destination strings
[1].

A suitable replacement is `strscpy` [2].

There are some hopes that someday the `strncpy` api could be ripped out
due to the vast number of suitable replacements (strscpy, strscpy_pad,
strtomem, strtomem_pad, strlcpy) [1].

[1]: www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings
[2]: manpages.debian.org/testing/linux-manual-4.8/strscpy.9.en.html

Link: https://github.com/KSPP/linux/issues/90
Signed-off-by: Justin Stitt <justinstitt@google.com>
Link: https://lore.kernel.org/r/20230725-sound-soc-intel-avs-remove-deprecated-strncpy-v1-1-6357a1f8e9cf@google.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/avs/topology.c

index cdb4ec5..45d0eb2 100644 (file)
@@ -1388,12 +1388,12 @@ static int avs_route_load(struct snd_soc_component *comp, int index,
                port = __ffs(mach->mach_params.i2s_link_mask);
 
                snprintf(buf, len, route->source, port);
-               strncpy((char *)route->source, buf, len);
+               strscpy((char *)route->source, buf, len);
                snprintf(buf, len, route->sink, port);
-               strncpy((char *)route->sink, buf, len);
+               strscpy((char *)route->sink, buf, len);
                if (route->control) {
                        snprintf(buf, len, route->control, port);
-                       strncpy((char *)route->control, buf, len);
+                       strscpy((char *)route->control, buf, len);
                }
        }