From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751603AbdGRLv6 (ORCPT ); Tue, 18 Jul 2017 07:51:58 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:59099 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751388AbdGRLv4 (ORCPT ); Tue, 18 Jul 2017 07:51:56 -0400 From: Arnd Bergmann To: Jaroslav Kysela , Takashi Iwai Cc: Arnd Bergmann , Julia Lawall , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 7/7] ALSA: pcxhr: fix string overflow warnings Date: Tue, 18 Jul 2017 13:48:10 +0200 Message-Id: <20170718114820.3681255-7-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170718114820.3681255-1-arnd@arndb.de> References: <20170718114820.3681255-1-arnd@arndb.de> X-Provags-ID: V03:K0:QqV/x429EXN7zxqcgF1vblihOwOeG72gVPuxqgFf94qIIlu35+E yxToAgutoe7c9nTOZOU3TbR+gzib+Che/uPIjxlbN53cSLtyD3P/j67DfgyQEtUcp2jptWg XjmjM96DWFCu9LQ5mS4HXnpyZOue8MXr6xWNwE0SyMDp2R3IGl0yCg6WVsRJxIP+fz2frr2 K6peGQ37G8WUR8pGIvcmQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:R+RLNXOcQOg=:kuJ5oDlpEP6IDVx/p5pMIy U/Rzqy8oDZ0reyB80x0o8M8giipjavShQ4II29bJO2nN2mfGoMf86xKoCoP/u1rff8koND+k1 w3QkBYoEYOT2QAq1mKryL2MWXVwpABGEOy4Gi+8DLNpgO+m7l/B4PIOqjlf+WRhQ3LycVSem6 iGW0CUIXCPrBZHA+1dYwyQ7pKbZixCtH5dxYYH689x8EKQ0iWrpmpbYdD42ugSEw1MQiKd+CX 7zLrwMDnt0bDMOXt1REyKCFUxFvKRJmGwAsKkJev0zSemmJMzfMGwTmzwc+qqUDjwuhiX9RgP nzPNdM17FFTonihtJgDjHN0V1GWGzzvf/882lH4EesJW7blGYOn0o/6riHoQWn9QeLQzZS6GC 4OBBosVO+T49LLeWWhF87GyvQ8eRTfpCmLGsFpDahNUERI/leyr1wGLrgDKccRusDb2GObSZm AeEjppPkGT5UpnmGRRl6mim3sb/aF3Njs54GFH2yOHJHSS6FM1gkYZqucULWFV2Pi8pO3xKIf qKotb5FWR0Be68slAw/a0ubdYrrUruidI3qIOcN+LIHOR/LCsbBrjXiQRdne6EGBrIzta6aGx o9Px8siahjoMco3l6xw4LkPbEEkRRgVcsK7v+JvZWcO2Rrxkz9dLYTj6thOZvAv3tZMY+NUUo fT+pt6+kxDtQSkNKMDb32xuQAWc+WJPj8e/3ZzLsIKJtAhgFMpRO8Bl7U43yXiHBOI+TwoxUk FmYEkXDMSaXOaFlGi+n3/TeECCD+SzZTYRvXXw== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org With gcc-7, we get a warning about a possible string overflow: sound/pci/pcxhr/pcxhr.c: In function 'pcxhr_probe': sound/pci/pcxhr/pcxhr.c:1647:28: error: ' [PCM #' directive writing 7 bytes into a region of size between 1 and 32 [-Werror=format-overflow=] The shortname can simply be removed, and the longname can be changed into a shorter "name" string that is used in three places. Making it a little shorter (40 bytes) avoids the risk of overflowing completely, but I also use snprintf() here for extra clarity. Signed-off-by: Arnd Bergmann --- sound/pci/pcxhr/pcxhr.c | 19 ++++++++++--------- sound/pci/pcxhr/pcxhr.h | 3 +-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c index bb7eee9d0c2b..fa919f52e225 100644 --- a/sound/pci/pcxhr/pcxhr.c +++ b/sound/pci/pcxhr/pcxhr.c @@ -1165,7 +1165,7 @@ int pcxhr_create_pcm(struct snd_pcxhr *chip) struct snd_pcm *pcm; char name[32]; - sprintf(name, "pcxhr %d", chip->chip_idx); + snprintf(name, sizeof(name), "pcxhr %d", chip->chip_idx); if ((err = snd_pcm_new(chip->card, name, 0, chip->nb_streams_play, chip->nb_streams_capt, &pcm)) < 0) { @@ -1252,7 +1252,7 @@ static void pcxhr_proc_info(struct snd_info_entry *entry, struct snd_pcxhr *chip = entry->private_data; struct pcxhr_mgr *mgr = chip->mgr; - snd_iprintf(buffer, "\n%s\n", mgr->longname); + snd_iprintf(buffer, "\n%s\n", mgr->name); /* stats available when embedded DSP is running */ if (mgr->dsp_loaded & (1 << PCXHR_FIRMWARE_DSP_MAIN_INDEX)) { @@ -1339,7 +1339,7 @@ static void pcxhr_proc_sync(struct snd_info_entry *entry, max_clock = PCXHR_CLOCK_TYPE_MAX; } - snd_iprintf(buffer, "\n%s\n", mgr->longname); + snd_iprintf(buffer, "\n%s\n", mgr->name); snd_iprintf(buffer, "Current Sample Clock\t: %s\n", texts[mgr->cur_clock_type]); snd_iprintf(buffer, "Current Sample Rate\t= %d\n", @@ -1597,10 +1597,9 @@ static int pcxhr_probe(struct pci_dev *pci, } mgr->irq = pci->irq; - sprintf(mgr->shortname, "Digigram %s", card_name); - sprintf(mgr->longname, "%s at 0x%lx & 0x%lx, 0x%lx irq %i", - mgr->shortname, - mgr->port[0], mgr->port[1], mgr->port[2], mgr->irq); + snprintf(mgr->name, sizeof(mgr->name), + "Digigram at 0x%lx & 0x%lx, 0x%lx irq %i", + mgr->port[0], mgr->port[1], mgr->port[2], mgr->irq); /* ISR lock */ mutex_init(&mgr->lock); @@ -1644,8 +1643,10 @@ static int pcxhr_probe(struct pci_dev *pci, } strcpy(card->driver, DRIVER_NAME); - sprintf(card->shortname, "%s [PCM #%d]", mgr->shortname, i); - sprintf(card->longname, "%s [PCM #%d]", mgr->longname, i); + snprintf(card->shortname, sizeof(card->shortname), + "Digigram [PCM #%d]", i); + snprintf(card->longname, sizeof(card->longname), + "%s [PCM #%d]", mgr->name, i); if ((err = pcxhr_create(mgr, card, i)) < 0) { snd_card_free(card); diff --git a/sound/pci/pcxhr/pcxhr.h b/sound/pci/pcxhr/pcxhr.h index 9e39e509a3ef..d799cbd37301 100644 --- a/sound/pci/pcxhr/pcxhr.h +++ b/sound/pci/pcxhr/pcxhr.h @@ -75,8 +75,7 @@ struct pcxhr_mgr { unsigned long port[3]; /* share the name */ - char shortname[32]; /* short name of this soundcard */ - char longname[96]; /* name of this soundcard */ + char name[40]; /* name of this soundcard */ struct pcxhr_rmh *prmh; -- 2.9.0