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

index 39b8ccf37cdd1e7fb0965c923161bbac8ccc161b..9c7270e4c35e4fef5de1bec678be92c7d2db4135 100644 (file)
@@ -655,11 +655,11 @@ static int __oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
        chip->irq = pci->irq;
        card->sync_irq = chip->irq;
 
-       strcpy(card->driver, chip->model.chip);
-       strcpy(card->shortname, chip->model.shortname);
+       strscpy(card->driver, chip->model.chip);
+       strscpy(card->shortname, chip->model.shortname);
        sprintf(card->longname, "%s at %#lx, irq %i",
                chip->model.longname, chip->addr, chip->irq);
-       strcpy(card->mixername, chip->model.chip);
+       strscpy(card->mixername, chip->model.chip);
        snd_component_add(card, chip->model.chip);
 
        err = oxygen_pcm_init(chip);
index b2a3fcfe31d4435258aeffc3e6da7d3ea34e8ef7..643141f345bba707f4e525e2fae8b091810961d9 100644 (file)
@@ -697,7 +697,7 @@ int oxygen_pcm_init(struct oxygen *chip)
                        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
                                        &oxygen_rec_b_ops);
                pcm->private_data = chip;
-               strcpy(pcm->name, "Multichannel");
+               strscpy(pcm->name, "Multichannel");
                if (outs)
                        snd_pcm_set_managed_buffer(pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream,
                                                   SNDRV_DMA_TYPE_DEV,
@@ -725,7 +725,7 @@ int oxygen_pcm_init(struct oxygen *chip)
                        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
                                        &oxygen_rec_c_ops);
                pcm->private_data = chip;
-               strcpy(pcm->name, "Digital");
+               strscpy(pcm->name, "Digital");
                snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,
                                               &chip->pci->dev,
                                               DEFAULT_BUFFER_BYTES,
@@ -755,7 +755,7 @@ int oxygen_pcm_init(struct oxygen *chip)
                        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
                                        &oxygen_rec_b_ops);
                pcm->private_data = chip;
-               strcpy(pcm->name, outs ? "Front Panel" : "Analog 2");
+               strscpy(pcm->name, outs ? "Front Panel" : "Analog 2");
                snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,
                                               &chip->pci->dev,
                                               DEFAULT_BUFFER_BYTES,
@@ -773,7 +773,7 @@ int oxygen_pcm_init(struct oxygen *chip)
                                     OXYGEN_REC_C_ROUTE_I2S_ADC_3,
                                     OXYGEN_REC_C_ROUTE_MASK);
                pcm->private_data = chip;
-               strcpy(pcm->name, "Analog 3");
+               strscpy(pcm->name, "Analog 3");
                snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,
                                               &chip->pci->dev,
                                               DEFAULT_BUFFER_BYTES,