diff options
| author | Dan Carpenter <error27@gmail.com> | 2010-05-14 16:48:28 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-17 08:09:51 +0200 |
| commit | b0fb75ad5c8ca205396d7a493c9be5a5da802747 (patch) | |
| tree | 11c6eaf8454e4755cc5b7a4f49becdb97af672d9 | |
| parent | 89485d4931769d40353ea49bff1596accff8f06e (diff) | |
| download | linux-b0fb75ad5c8ca205396d7a493c9be5a5da802747.tar.gz linux-b0fb75ad5c8ca205396d7a493c9be5a5da802747.tar.bz2 linux-b0fb75ad5c8ca205396d7a493c9be5a5da802747.zip | |
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.c | 11 |
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) if (error < 0) return error; - strcpy(card->driver, "ES1688"); - strcpy(card->shortname, pcm->name); - sprintf(card->longname, "%s at 0x%lx, irq %i, dma %i", pcm->name, - chip->port, chip->irq, chip->dma8); + strlcpy(card->driver, "ES1688", sizeof(card->driver)); + strlcpy(card->shortname, pcm->name, sizeof(card->shortname)); + snprintf(card->longname, sizeof(card->longname), + "%s at 0x%lx, irq %i, dma %i", pcm->name, chip->port, + chip->irq, chip->dma8); if (fm_port[n] == SNDRV_AUTO_PORT) 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, if (enable[dev] && isapnp[dev]) break; } + if (dev == SNDRV_CARDS) + return -ENODEV; error = snd_card_create(index[dev], id[dev], THIS_MODULE, sizeof(struct snd_es1688), &card); |