]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ALSA: sc6000: Use safer strscpy() instead of strcpy()
authorTakashi Iwai <tiwai@suse.de>
Thu, 10 Jul 2025 10:06:17 +0000 (12:06 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 11 Jul 2025 07:53:15 +0000 (09:53 +0200)
Use a safer function strscpy() instead of strcpy() for copying to
arrays.

Only idiomatic code replacement, and no functional changes.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20250710100727.22653-36-tiwai@suse.de
sound/isa/sc6000.c

index 3115c32b4061b704af6a997b5e10b6d0aed83eeb..6d618cc2ba45776dc965ef86e09890786a84f672 100644 (file)
@@ -469,24 +469,24 @@ static int snd_sc6000_mixer(struct snd_wss *chip)
        id1.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
        id2.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
        /* reassign AUX0 to FM */
-       strcpy(id1.name, "Aux Playback Switch");
-       strcpy(id2.name, "FM Playback Switch");
+       strscpy(id1.name, "Aux Playback Switch");
+       strscpy(id2.name, "FM Playback Switch");
        err = snd_ctl_rename_id(card, &id1, &id2);
        if (err < 0)
                return err;
-       strcpy(id1.name, "Aux Playback Volume");
-       strcpy(id2.name, "FM Playback Volume");
+       strscpy(id1.name, "Aux Playback Volume");
+       strscpy(id2.name, "FM Playback Volume");
        err = snd_ctl_rename_id(card, &id1, &id2);
        if (err < 0)
                return err;
        /* reassign AUX1 to CD */
-       strcpy(id1.name, "Aux Playback Switch"); id1.index = 1;
-       strcpy(id2.name, "CD Playback Switch");
+       strscpy(id1.name, "Aux Playback Switch"); id1.index = 1;
+       strscpy(id2.name, "CD Playback Switch");
        err = snd_ctl_rename_id(card, &id1, &id2);
        if (err < 0)
                return err;
-       strcpy(id1.name, "Aux Playback Volume");
-       strcpy(id2.name, "CD Playback Volume");
+       strscpy(id1.name, "Aux Playback Volume");
+       strscpy(id2.name, "CD Playback Volume");
        err = snd_ctl_rename_id(card, &id1, &id2);
        if (err < 0)
                return err;
@@ -652,8 +652,8 @@ static int __snd_sc6000_probe(struct device *devptr, unsigned int dev)
                                mpu_port[dev]);
        }
 
-       strcpy(card->driver, DRV_NAME);
-       strcpy(card->shortname, "SC-6000");
+       strscpy(card->driver, DRV_NAME);
+       strscpy(card->shortname, "SC-6000");
        sprintf(card->longname, "Gallant SC-6000 at 0x%lx, irq %d, dma %d",
                mss_port[dev], xirq, xdma);