* [PATCH] ALSA: xen: ensure nul-terminated device name
@ 2018-05-28 15:59 Arnd Bergmann
2018-05-29 5:48 ` [alsa-devel] " Oleksandr Andrushchenko
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2018-05-28 15:59 UTC (permalink / raw)
To: Oleksandr Andrushchenko, Jaroslav Kysela, Takashi Iwai
Cc: Arnd Bergmann, xen-devel, alsa-devel, linux-kernel
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: fd3b36045c2c ("ALSA: xen-front: Read sound driver configuration from Xen store")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
sound/xen/xen_snd_front_cfg.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/xen/xen_snd_front_cfg.c b/sound/xen/xen_snd_front_cfg.c
index 38c7e1eefbb9..684b5f1d51ac 100644
--- a/sound/xen/xen_snd_front_cfg.c
+++ b/sound/xen/xen_snd_front_cfg.c
@@ -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);
}
--
2.9.0
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [alsa-devel] [PATCH] ALSA: xen: ensure nul-terminated device name
2018-05-28 15:59 [PATCH] ALSA: xen: ensure nul-terminated device name Arnd Bergmann
@ 2018-05-29 5:48 ` Oleksandr Andrushchenko
2018-05-29 6:28 ` Takashi Iwai
0 siblings, 1 reply; 3+ messages in thread
From: Oleksandr Andrushchenko @ 2018-05-29 5:48 UTC (permalink / raw)
To: Arnd Bergmann, Oleksandr Andrushchenko, Jaroslav Kysela, Takashi Iwai
Cc: xen-devel, alsa-devel, linux-kernel
On 05/28/2018 06:59 PM, Arnd Bergmann wrote:
> 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: fd3b36045c2c ("ALSA: xen-front: Read sound driver configuration from Xen store")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> sound/xen/xen_snd_front_cfg.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/xen/xen_snd_front_cfg.c b/sound/xen/xen_snd_front_cfg.c
> index 38c7e1eefbb9..684b5f1d51ac 100644
> --- a/sound/xen/xen_snd_front_cfg.c
> +++ b/sound/xen/xen_snd_front_cfg.c
> @@ -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);
> }
>
Thank you for your patch,
Reviewed-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [alsa-devel] [PATCH] ALSA: xen: ensure nul-terminated device name
2018-05-29 5:48 ` [alsa-devel] " Oleksandr Andrushchenko
@ 2018-05-29 6:28 ` Takashi Iwai
0 siblings, 0 replies; 3+ messages in thread
From: Takashi Iwai @ 2018-05-29 6:28 UTC (permalink / raw)
To: Oleksandr Andrushchenko
Cc: Arnd Bergmann, Oleksandr Andrushchenko, Jaroslav Kysela,
alsa-devel, xen-devel, linux-kernel
On Tue, 29 May 2018 07:48:51 +0200,
Oleksandr Andrushchenko wrote:
>
> On 05/28/2018 06:59 PM, Arnd Bergmann wrote:
> > 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: fd3b36045c2c ("ALSA: xen-front: Read sound driver configuration from Xen store")
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > ---
> > sound/xen/xen_snd_front_cfg.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/sound/xen/xen_snd_front_cfg.c b/sound/xen/xen_snd_front_cfg.c
> > index 38c7e1eefbb9..684b5f1d51ac 100644
> > --- a/sound/xen/xen_snd_front_cfg.c
> > +++ b/sound/xen/xen_snd_front_cfg.c
> > @@ -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);
> > }
> >
> Thank you for your patch,
> Reviewed-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Applied now. Thanks.
Takashi
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-05-29 6:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-28 15:59 [PATCH] ALSA: xen: ensure nul-terminated device name Arnd Bergmann
2018-05-29 5:48 ` [alsa-devel] " Oleksandr Andrushchenko
2018-05-29 6:28 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®