ALSA: emu10k1: Fix forgotten user-copy conversion in init code
PATCH 1/1 ALSA: emu10k1: Fix forgotten user-copy conversion in init code
The commit d42fe63d5839 ("ALSA: emu10k1: Get rid of set_fs() usage") converted the user-space copy hack with set_fs() to the direct memcpy(), but one place was forgotten. This resulted in the error from snd_emu10k1_init_efx(), eventually failed to load the driver. Fix the missing piece.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=196687
Fixes d42fe63d5839 ("ALSA: emu10k1: Get rid of set_fs() usage")
Signed-off-by Takashi Iwai <[email protected]>
--- sound/pci/emu10k1/emufx.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
sound/pci/emu10k1/emufx.c +11 -3
@@ -698,10 +698,18 @@ static int copy_gctl(struct snd_emu10k1 *emu, {struct snd_emu10k1_fx8010_control_old_gpr __user *octl; -if (emu->support_tlv) -return copy_from_user (gctl, &_gctl[idx],sizeof (*gctl)); +if (emu->support_tlv) { +if (in_kernel) +memcpy (gctl, (void *)&_gctl[idx],sizeof (*gctl)); +else if (copy_from_user (gctl, &_gctl[idx],sizeof (*gctl))) +return -EFAULT ; +return 0 ; + } + octl = (struct snd_emu10k1_fx8010_control_old_gpr __user *)_gctl; -if (copy_from_user (gctl, &octl[idx],sizeof (*octl))) +if (in_kernel) +memcpy (gctl, (void *)&octl[idx],sizeof (*octl)); +else if (copy_from_user (gctl, &octl[idx],sizeof (*octl)))return -EFAULT ; gctl->tlv =NULL ;return 0 ;
Signature · 1 line
2.14.1