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

Commit 4c0eaac7 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Takashi Iwai
Browse files

ALSA: xen: ensure nul-terminated device name 



gcc-8 warns that pcm_instance->name is not necessarily terminated correctly
if the input is more than 80 characters long or lacks a termination byte
itself:

In function 'strncpy',
    inlined from 'cfg_device' at sound/xen/xen_snd_front_cfg.c:399:3,
    inlined from 'xen_snd_front_cfg_card' at sound/xen/xen_snd_front_cfg.c:509:9:
include/linux/string.h:254:9: error: '__builtin_strncpy' specified bound 80 equals destination size [-Werror=stringop-truncation]
  return __builtin_strncpy(p, q, size);

Using strlcpy() instead of strncpy() makes this a bit safer.

Fixes: fd3b3604 ("ALSA: xen-front: Read sound driver configuration from Xen store")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarOleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 011ae2bf

sound/xen/xen_snd_front_cfg.c

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static int cfg_device(struct xen_snd_front_info *front_info, 


	str = xenbus_read(XBT_NIL, device_path, XENSND_FIELD_DEVICE_NAME, NULL);

	if (!IS_ERR(str)) {

		strncpy(pcm_instance->name, str, sizeof(pcm_instance->name));

		strlcpy(pcm_instance->name, str, sizeof(pcm_instance->name));

		kfree(str);

	}