]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ALSA: cmi8328: Use safer strscpy() instead of strcpy()
authorTakashi Iwai <tiwai@suse.de>
Thu, 10 Jul 2025 10:06:07 +0000 (12:06 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 11 Jul 2025 07:53:14 +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-26-tiwai@suse.de
sound/isa/cmi8328.c

index d30cce4cc7e39d206ec92bcae32b656fb0a89df9..4e6d823af103a45f96f4bc7a734e4b257336c305 100644 (file)
@@ -155,34 +155,34 @@ static int snd_cmi8328_mixer(struct snd_wss *chip)
        memset(&id2, 0, sizeof(id2));
        id1.iface = id2.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
        /* rename AUX0 switch to CD */
-       strcpy(id1.name, "Aux Playback Switch");
-       strcpy(id2.name, "CD Playback Switch");
+       strscpy(id1.name, "Aux Playback Switch");
+       strscpy(id2.name, "CD Playback Switch");
        err = snd_ctl_rename_id(card, &id1, &id2);
        if (err < 0) {
                dev_err(card->dev, "error renaming control\n");
                return err;
        }
        /* rename AUX0 volume to CD */
-       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) {
                dev_err(card->dev, "error renaming control\n");
                return err;
        }
        /* rename AUX1 switch to Synth */
-       strcpy(id1.name, "Aux Playback Switch");
+       strscpy(id1.name, "Aux Playback Switch");
        id1.index = 1;
-       strcpy(id2.name, "Synth Playback Switch");
+       strscpy(id2.name, "Synth Playback Switch");
        err = snd_ctl_rename_id(card, &id1, &id2);
        if (err < 0) {
                dev_err(card->dev, "error renaming control\n");
                return err;
        }
        /* rename AUX1 volume to Synth */
-       strcpy(id1.name, "Aux Playback Volume");
+       strscpy(id1.name, "Aux Playback Volume");
        id1.index = 1;
-       strcpy(id2.name, "Synth Playback Volume");
+       strscpy(id2.name, "Synth Playback Volume");
        err = snd_ctl_rename_id(card, &id1, &id2);
        if (err < 0) {
                dev_err(card->dev, "error renaming control\n");
@@ -362,8 +362,8 @@ static int snd_cmi8328_probe(struct device *pdev, unsigned int ndev)
                if (snd_opl3_hwdep_new(opl3, 0, 1, NULL) < 0)
                        dev_warn(pdev, "error initializing OPL3 hwdep\n");
 
-       strcpy(card->driver, "CMI8328");
-       strcpy(card->shortname, "C-Media CMI8328");
+       strscpy(card->driver, "CMI8328");
+       strscpy(card->shortname, "C-Media CMI8328");
        sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d,%d",
                card->shortname, cmi->wss->port, irq[ndev], dma1[ndev],
                (dma2[ndev] >= 0) ? dma2[ndev] : dma1[ndev]);