From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751690AbdGRLuL (ORCPT ); Tue, 18 Jul 2017 07:50:11 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:62803 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751634AbdGRLuI (ORCPT ); Tue, 18 Jul 2017 07:50:08 -0400 From: Arnd Bergmann To: Jaroslav Kysela , Takashi Iwai Cc: Arnd Bergmann , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/7] ALSA: mixart: fix string overflow warning Date: Tue, 18 Jul 2017 13:48:08 +0200 Message-Id: <20170718114820.3681255-5-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:7nQveC8MF12Xa2oqisESjTktCk0Nd74SDWRvnz2I/DFPMbPoWK0 Q2MD/VhowjQJz3Rp6Jq2wO3rYGq7S/JtLQdAvq2e6XzSFFU9+fuQs4RY1qeNAvISagkr0vQ Nw0Yf+6hoatzJsIolhyOFAQd+Iy0+RiBjaBMUK4UsCmdHsO9sK/s6YAgTz7HND7AJnHYsTS H/HYrd7A+2sAhq8CRGw5A== X-UI-Out-Filterresults: notjunk:1;V01:K0:ehOB65Ro9IU=:pfMyHJLEMAC94oJGzZsZkv QTCrLDk36aGCZKNrilrBf7Sn/zhO5I54YeBA2dNIcZrsp48fqwgWCyDwLrefJgcnl20BDNTwe KVEOiuFMk4rCXJ7i6BERZHhtwD7F/Ooh+gjqHNZTVIXJ6sPKVLFeEWbezp2KFu8iLd4ndmHG5 mh31cdIXQPzODQFHsdhw9sr2hTb0JMaPcszhDcXzeqyED4CcHnbBzM1t4W/3YVUlq2Sg2G1Vo slgSCqsNjIq8Bfl4ZBGPz5psDRaFOSsqnlhbjL9udnxIVaU4AE4zmB3PXRUJiSNWnk5jg9yz6 wnlFiWsP+/Z3fShzeSJgGa1TOIc4+aogv24w09QLskBfySF6pAC26buF31pEVMyJK3l9ycrQ+ fRDVGz9a3KKciRay+VhRFLAUOJIoNTpMIJS55A2PwRU6RL6zRp464pgX7BQ2IN8DSIxy8LDcy SMR6im/pjJTp+gjT/+K/w70GCSNVaqNIYtTjfo4RKlAv4U/nO4tYXIugplvwf9SI/Xi4PUYcF 49P9hoR6cjrEV+C/q05nm3ILl2pUhAnftFxqAQSaIlR7h9zRpbjDJpxwbzuobLXI4Nbxa0yE/ ELczy/h8iGctOAnY24n61MYCdzQ/Gxpl/Cs4dNwYn/fJR4R5jPEcyGtGKp5qWlbxYbPIrPyb0 jf8XnB69sYJv0oI5HQYCLIPGjUGnJBKoXnQCQxGlfKPANI86Z6NtpXqmKUVZ0cUWmbkyNW24E tBNLjqjrfJvlAg0nJJ1+HhDnboINY8V4EHPPJQ== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Using a temporary string produces warnings about a possible overflow in sprintf: sound/pci/mixart/mixart.c: In function 'snd_mixart_probe': sound/pci/mixart/mixart.c:1353:28: error: ' [PCM #' directive writing 7 bytes into a region of size between 1 and 32 [-Werror=format-overflow=] sprintf(card->shortname, "%s [PCM #%d]", mgr->shortname, i); ^~~~~~~~~~~~~~ sound/pci/mixart/mixart.c:1353:28: note: using the range [-2147483648, 2147483647] for directive argument sound/pci/mixart/mixart.c:1353:3: note: 'sprintf' output between 10 and 51 bytes into a destination of size 32 sprintf(card->shortname, "%s [PCM #%d]", mgr->shortname, i); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sound/pci/mixart/mixart.c:1354:27: error: ' [PCM #' directive writing 7 bytes into a region of size between 1 and 80 [-Werror=format-overflow=] sprintf(card->longname, "%s [PCM #%d]", mgr->longname, i); ^~~~~~~~~~~~~~ sound/pci/mixart/mixart.c:1354:27: note: using the range [-2147483648, 2147483647] for directive argument sound/pci/mixart/mixart.c:1354:3: note: 'sprintf' output between 10 and 99 bytes into a destination of size 80 Skipping the intermediate, we can get gcc to see that it is in fact safe here. Signed-off-by: Arnd Bergmann --- sound/pci/mixart/mixart.c | 10 +++++----- sound/pci/mixart/mixart.h | 4 ---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c index 80d439944cb5..6d7fbf30618b 100644 --- a/sound/pci/mixart/mixart.c +++ b/sound/pci/mixart/mixart.c @@ -1313,9 +1313,6 @@ static int snd_mixart_probe(struct pci_dev *pci, } mgr->irq = pci->irq; - sprintf(mgr->shortname, "Digigram miXart"); - sprintf(mgr->longname, "%s at 0x%lx & 0x%lx, irq %i", mgr->shortname, mgr->mem[0].phys, mgr->mem[1].phys, mgr->irq); - /* init mailbox */ mgr->msg_fifo_readptr = 0; mgr->msg_fifo_writeptr = 0; @@ -1350,8 +1347,11 @@ static int snd_mixart_probe(struct pci_dev *pci, } strcpy(card->driver, CARD_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 miXart [PCM #%d]", i); + snprintf(card->longname, sizeof(card->longname), + "Digigram miXart at 0x%lx & 0x%lx, irq %i [PCM #%d]", + mgr->mem[0].phys, mgr->mem[1].phys, mgr->irq, i); if ((err = snd_mixart_create(mgr, card, i)) < 0) { snd_card_free(card); diff --git a/sound/pci/mixart/mixart.h b/sound/pci/mixart/mixart.h index 426743871540..69b3ece099ad 100644 --- a/sound/pci/mixart/mixart.h +++ b/sound/pci/mixart/mixart.h @@ -74,10 +74,6 @@ struct mixart_mgr { /* memory-maps */ struct mem_area mem[2]; - /* share the name */ - char shortname[32]; /* short name of this soundcard */ - char longname[80]; /* name of this soundcard */ - /* one and only blocking message or notification may be pending */ u32 pending_event; wait_queue_head_t msg_sleep; -- 2.9.0