aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-05-14 10:48:28 -0400
committerTakashi Iwai <tiwai@suse.de>2010-05-17 02:09:51 -0400
commitb0fb75ad5c8ca205396d7a493c9be5a5da802747 (patch)
tree11c6eaf8454e4755cc5b7a4f49becdb97af672d9
parent89485d4931769d40353ea49bff1596accff8f06e (diff)
ALSA: es1688: add pedantic range checks
Smatch complains that if (dev == SNDRV_CARDS) we're one past the end of the array. That's unlikely to happen in real life, I suppose. Also smatch complains about "strcpy(card->shortname, pcm->name);" The "pcm->name" buffer is 80 characters and "card->shortname" is 32 characters. If you follow the call paths it turns out we never actually use more than 16 characters so it's not a problem. But anyway, let's make it easy for people auditing this in the future. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/isa/es1688/es1688.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c
index fdcce311f80a..0cde8131a575 100644
--- a/sound/isa/es1688/es1688.c
+++ b/sound/isa/es1688/es1688.c
@@ -149,10 +149,11 @@ static int __devinit snd_es1688_probe(struct snd_card *card, unsigned int n)
149 if (error < 0) 149 if (error < 0)
150 return error; 150 return error;
151 151
152 strcpy(card->driver, "ES1688"); 152 strlcpy(card->driver, "ES1688", sizeof(card->driver));
153 strcpy(card->shortname, pcm->name); 153 strlcpy(card->shortname, pcm->name, sizeof(card->shortname));
154 sprintf(card->longname, "%s at 0x%lx, irq %i, dma %i", pcm->name, 154 snprintf(card->longname, sizeof(card->longname),
155 chip->port, chip->irq, chip->dma8); 155 "%s at 0x%lx, irq %i, dma %i", pcm->name, chip->port,
156 chip->irq, chip->dma8);
156 157
157 if (fm_port[n] == SNDRV_AUTO_PORT) 158 if (fm_port[n] == SNDRV_AUTO_PORT)
158 fm_port[n] = port[n]; /* share the same port */ 159 fm_port[n] = port[n]; /* share the same port */
@@ -271,6 +272,8 @@ static int __devinit snd_es968_pnp_detect(struct pnp_card_link *pcard,
271 if (enable[dev] && isapnp[dev]) 272 if (enable[dev] && isapnp[dev])
272 break; 273 break;
273 } 274 }
275 if (dev == SNDRV_CARDS)
276 return -ENODEV;
274 277
275 error = snd_card_create(index[dev], id[dev], THIS_MODULE, 278 error = snd_card_create(index[dev], id[dev], THIS_MODULE,
276 sizeof(struct snd_es1688), &card); 279 sizeof(struct snd_es1688), &card);