Skip to content

Commit 86496fd

Browse files
committed
ALSA: seq: Fix snd_seq_expand_var_event() call to user-space
The recent fix to clear the padding bytes at snd_seq_expand_var_event() broke the read to user-space with in_kernel=0 parameter. For user-space address, it has to use clear_user() instead of memset(). Fixes: f80e6d6 ("ALSA: seq: Clear padded bytes at expanding events") Reported-and-tested-by: Ash Holland <ash@sorrel.sh> Closes: https://lore.kernel.org/r/8a555319-9f31-4ea2-878f-adc338bc40d4@sorrel.sh Link: https://lore.kernel.org/r/20230905052631.18240-1-tiwai@suse.de Link: https://lore.kernel.org/r/20230905081210.6731-1-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
1 parent b1757fa commit 86496fd

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

sound/core/seq/seq_memory.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,13 @@ int snd_seq_expand_var_event(const struct snd_seq_event *event, int count, char
187187
err = expand_var_event(event, 0, len, buf, in_kernel);
188188
if (err < 0)
189189
return err;
190-
if (len != newlen)
191-
memset(buf + len, 0, newlen - len);
190+
if (len != newlen) {
191+
if (in_kernel)
192+
memset(buf + len, 0, newlen - len);
193+
else if (clear_user((__force void __user *)buf + len,
194+
newlen - len))
195+
return -EFAULT;
196+
}
192197
return newlen;
193198
}
194199
EXPORT_SYMBOL(snd_seq_expand_var_event);

0 commit comments

Comments
 (0)