]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ALSA: msnd: Use safer strscpy() instead of strcpy()
authorTakashi Iwai <tiwai@suse.de>
Thu, 10 Jul 2025 10:06:14 +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-33-tiwai@suse.de
sound/isa/msnd/msnd.c
sound/isa/msnd/msnd_pinnacle.c
sound/isa/msnd/msnd_pinnacle_mixer.c

index 69c515421dd81e0d71c9daa2c55e3e4b05ba90ef..8c1d2e27854bc800ab116c855861e863901fd6f8 100644 (file)
@@ -673,7 +673,7 @@ int snd_msnd_pcm(struct snd_card *card, int device)
        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_msnd_capture_ops);
 
        pcm->private_data = chip;
-       strcpy(pcm->name, "Hurricane");
+       strscpy(pcm->name, "Hurricane");
 
        return 0;
 }
index 8caf431677e58600ccdd6253b89a4596fac68718..969bbb18657b9934a31e8958f8aea20ec5173ec0 100644 (file)
@@ -221,8 +221,8 @@ static int snd_msnd_probe(struct snd_card *card)
        }
 
 #ifdef MSND_CLASSIC
-       strcpy(card->shortname, "Classic/Tahiti/Monterey");
-       strcpy(card->longname, "Turtle Beach Multisound");
+       strscpy(card->shortname, "Classic/Tahiti/Monterey");
+       strscpy(card->longname, "Turtle Beach Multisound");
        dev_info(card->dev, LOGNAME ": %s, "
               "I/O 0x%lx-0x%lx, IRQ %d, memory mapped to 0x%lX-0x%lX\n",
               card->shortname,
@@ -251,38 +251,38 @@ static int snd_msnd_probe(struct snd_card *card)
        switch (info & 0x7) {
        case 0x0:
                rev = "I";
-               strcpy(card->shortname, pin);
+               strscpy(card->shortname, pin);
                break;
        case 0x1:
                rev = "F";
-               strcpy(card->shortname, pin);
+               strscpy(card->shortname, pin);
                break;
        case 0x2:
                rev = "G";
-               strcpy(card->shortname, pin);
+               strscpy(card->shortname, pin);
                break;
        case 0x3:
                rev = "H";
-               strcpy(card->shortname, pin);
+               strscpy(card->shortname, pin);
                break;
        case 0x4:
                rev = "E";
-               strcpy(card->shortname, fiji);
+               strscpy(card->shortname, fiji);
                break;
        case 0x5:
                rev = "C";
-               strcpy(card->shortname, fiji);
+               strscpy(card->shortname, fiji);
                break;
        case 0x6:
                rev = "D";
-               strcpy(card->shortname, fiji);
+               strscpy(card->shortname, fiji);
                break;
        case 0x7:
                rev = "A-B (Fiji) or A-E (Pinnacle)";
-               strcpy(card->shortname, pinfiji);
+               strscpy(card->shortname, pinfiji);
                break;
        }
-       strcpy(card->longname, "Turtle Beach Multisound Pinnacle");
+       strscpy(card->longname, "Turtle Beach Multisound Pinnacle");
        dev_info(card->dev, LOGNAME ": %s revision %s, Xilinx version %s, "
               "I/O 0x%lx-0x%lx, IRQ %d, memory mapped to 0x%lX-0x%lX\n",
               card->shortname,
index 63633bd41e5b6ccc85168fad989f0e09711e8ab1..2f1bb5a2b376d57cf0acea48b959d5339a17a80d 100644 (file)
@@ -299,7 +299,7 @@ int snd_msndmix_new(struct snd_card *card)
        if (snd_BUG_ON(!chip))
                return -EINVAL;
        spin_lock_init(&chip->mixer_lock);
-       strcpy(card->mixername, "MSND Pinnacle Mixer");
+       strscpy(card->mixername, "MSND Pinnacle Mixer");
 
        for (idx = 0; idx < ARRAY_SIZE(snd_msnd_controls); idx++) {
                err = snd_ctl_add(card,