Changeset 695 for GPL/trunk/alsa-kernel/pci/emu10k1/emufx.c

Timestamp:

Aug 21, 2021, 3:35:34 AM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/emu10k1/emufx.c (modified) (3 diffs)

GPL/trunk/alsa-kernel/pci/emu10k1/emufx.c

@@ -942 +942 @@
                         id = &ctl->kcontrol->id;
                         gctl->id.iface = (__force int)id->iface;
-                        strlcpy(gctl->id.name, id->name, sizeof(gctl->id.name));
+                        strscpy(gctl->id.name, id->name, sizeof(gctl->id.name));
                         gctl->id.index = id->index;
                         gctl->id.device = id->device;
@@ -978 +978 @@
         if (err < 0)
                 goto __error;
-        strlcpy(emu->fx8010.name, icode->name, sizeof(emu->fx8010.name));
+        strscpy(emu->fx8010.name, icode->name, sizeof(emu->fx8010.name));
         /* stop FX processor - this may be dangerous, but it's better to miss
            some samples than generate wrong ones - [jk] */
@@ -1017 +1017 @@
 
         mutex_lock(&emu->fx8010.lock);
-        strlcpy(icode->name, emu->fx8010.name, sizeof(icode->name));
+        strscpy(icode->name, emu->fx8010.name, sizeof(icode->name));
         /* ok, do the main job */
         err = snd_emu10k1_gpr_peek(emu, icode);