lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Dimitris Papastamos
2010-12-06 15:42:17 +00:00
committed by Mark Brown
parent 589c3563f6
commit 58818a77cd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/soc-core.c
View File

@@ -3183,7 +3183,7 @@ static inline char *fmt_single_name(struct device *dev, int *id)
if (dev_name(dev) == NULL) if (dev_name(dev) == NULL)
return 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) */ /* are we a "%s.%d" name (platform and SPI components) */
found = strstr(name, dev->driver->name); 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 */ /* sanitize component name for DAI link creation */
snprintf(tmp, NAME_SIZE, "%s.%s", dev->driver->name, name); snprintf(tmp, NAME_SIZE, "%s.%s", dev->driver->name, name);
strncpy(name, tmp, NAME_SIZE); strlcpy(name, tmp, NAME_SIZE);
} else } else
*id = 0; *id = 0;
} }