Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58818a77 authored by Dimitris Papastamos's avatar Dimitris Papastamos Committed by Mark Brown
Browse files

ASoC: soc-core: Replace use of strncpy() with strlcpy() 



By using strncpy() if the source string does not have a null byte in the
first n bytes, then the destination string is not null-terminated.
This can be fixed in a two-step process by manually null-terminating the
array after the use of strncpy() or by using strlcpy().

Signed-off-by: default avatarDimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 589c3563

sound/soc/soc-core.c

+2 −2
Original line number Diff line number Diff line
@@ -3183,7 +3183,7 @@ static inline char *fmt_single_name(struct device *dev, int *id) 
	if (dev_name(dev) == NULL)

		return NULL;



	strncpy(name, dev_name(dev), NAME_SIZE);

	strlcpy(name, dev_name(dev), NAME_SIZE);



	/* are we a "%s.%d" name (platform and SPI components) */

	found = strstr(name, dev->driver->name);
@@ -3206,7 +3206,7 @@ static inline char *fmt_single_name(struct device *dev, int *id) 


			/* sanitize component name for DAI link creation */

			snprintf(tmp, NAME_SIZE, "%s.%s", dev->driver->name, name);

			strncpy(name, tmp, NAME_SIZE);

			strlcpy(name, tmp, NAME_SIZE);

		} else

			*id = 0;

	}