From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754674AbeE2G2k (ORCPT ); Tue, 29 May 2018 02:28:40 -0400 Received: from mx2.suse.de ([195.135.220.15]:58275 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754466AbeE2G21 (ORCPT ); Tue, 29 May 2018 02:28:27 -0400 Date: Tue, 29 May 2018 08:28:26 +0200 Message-ID: From: Takashi Iwai To: "Oleksandr Andrushchenko" Cc: "Arnd Bergmann" , "Oleksandr Andrushchenko" , "Jaroslav Kysela" , , , Subject: Re: [alsa-devel] [PATCH] ALSA: xen: ensure nul-terminated device name In-Reply-To: <2469af3f-df85-fbca-a486-566f9aaa436d@gmail.com> References: <20180528160011.2989632-1-arnd@arndb.de> <2469af3f-df85-fbca-a486-566f9aaa436d@gmail.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > > --- > > 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 Applied now. Thanks. Takashi