diff options
Diffstat (limited to 'sys/i386/isa/snd')
| -rw-r--r-- | sys/i386/isa/snd/ad1848.c | 8 | ||||
| -rw-r--r-- | sys/i386/isa/snd/sb_dsp.c | 3 | ||||
| -rw-r--r-- | sys/i386/isa/snd/sound.c | 11 |
3 files changed, 13 insertions, 9 deletions
diff --git a/sys/i386/isa/snd/ad1848.c b/sys/i386/isa/snd/ad1848.c index 6ded9bf..56021d9 100644 --- a/sys/i386/isa/snd/ad1848.c +++ b/sys/i386/isa/snd/ad1848.c @@ -1300,7 +1300,7 @@ mss_detect(struct isa_device *dev) } } BVDDB(printf("mss_detect() - Detected %s\n", name)); - strcpy(d->name, name); + snprintf(d->name, sizeof(d->name), "%s", name); dev->id_flags &= ~DV_F_DEV_MASK ; dev->id_flags |= (d->bd_id << DV_F_DEV_SHIFT) & DV_F_DEV_MASK ; return 1; @@ -1500,7 +1500,7 @@ cs423x_attach(u_long csn, u_long vend_id, char *name, tmp_d.bd_id = MD_CS4232 ; /* to short-circuit the detect routine */ break; } - strcpy(tmp_d.name, name); + snprintf(tmp_d.name, sizeof(tmp_d.name), "%s", name); tmp_d.audio_fmt |= AFMT_FULLDUPLEX ; } write_pnp_parms( &d, ldn ); @@ -1574,7 +1574,7 @@ opti931_attach(u_long csn, u_long vend_id, char *name, snddev_last_probed = &tmp_d; tmp_d = d.flags & DV_PNP_SBCODEC ? sb_op_desc : mss_op_desc ; - strcpy(tmp_d.name, name); + snprintf(tmp_d.name, sizeof(tmp_d.name), "%s", name); /* * My MED3931 v.1.0 allocates 3 bytes for the config space, @@ -1780,7 +1780,7 @@ guspnp_attach(u_long csn, u_long vend_id, char *name, gus_write(tmp_d.conf_base, 0x5b , tmp | 1 ); BVDDB(printf("GUS: silicon rev %c\n", 'A' + ( ( tmp & 0xf ) >> 4) );) - strcpy(tmp_d.name, name); + snprintf(tmp_d.name, sizeof(tmp_d.name), "%s", name); pcmattach(dev); } diff --git a/sys/i386/isa/snd/sb_dsp.c b/sys/i386/isa/snd/sb_dsp.c index 2b2e84a..06599ec 100644 --- a/sys/i386/isa/snd/sb_dsp.c +++ b/sys/i386/isa/snd/sb_dsp.c @@ -739,7 +739,8 @@ sb_dsp_init(snddev_info *d, struct isa_device *dev) } - sprintf(d->name, fmt, (d->bd_id >> 8) &0xff, d->bd_id & 0xff); + snprintf(d->name, sizeof(d->name), + fmt, (d->bd_id >> 8) &0xff, d->bd_id & 0xff); sb_mix_init(d); } diff --git a/sys/i386/isa/snd/sound.c b/sys/i386/isa/snd/sound.c index 6a26c07..3253af9 100644 --- a/sys/i386/isa/snd/sound.c +++ b/sys/i386/isa/snd/sound.c @@ -1300,19 +1300,21 @@ init_status(snddev_info *d) if (status_len != 0) /* only do init once */ return ; - sprintf(status_buf, + snprintf(status_buf, sizeof(status_buf), "FreeBSD Audio Driver (981002) " __DATE__ " " __TIME__ "\n" "Installed devices:\n"); for (i = 0; i < NPCM_MAX; i++) { if (pcm_info[i].open) - sprintf(status_buf + strlen(status_buf), + snprintf(status_buf + strlen(status_buf), + sizeof(status_buf) - strlen(status_buf), "pcm%d: <%s> at 0x%x irq %d dma %d:%d\n", i, pcm_info[i].name, pcm_info[i].io_base, pcm_info[i].irq, pcm_info[i].dbuf_out.chan, pcm_info[i].dbuf_in.chan); if (midi_info[i].open) - sprintf(status_buf + strlen(status_buf), + snprintf(status_buf + strlen(status_buf), + sizeof(status_buf) - strlen(status_buf), "midi%d: <%s> at 0x%x irq %d dma %d:%d\n", i, midi_info[i].name, midi_info[i].io_base, midi_info[i].irq, @@ -1325,7 +1327,8 @@ init_status(snddev_info *d) case 4 : s = "OPL4"; break; } - sprintf(status_buf + strlen(status_buf), + snprintf(status_buf + strlen(status_buf), + sizeof(status_buf) - strlen(status_buf), "sequencer%d: <%s> at 0x%x (not functional)\n", i, s, pcm_info[i].synth_base); } |
