Skip to content

Commit f80e6d6

Browse files
committed
ALSA: seq: Clear padded bytes at expanding events
There can be a small memory hole that may not be cleared at expanding an event with the variable length type. Make sure to clear it. Reviewed-by: Jaroslav Kysela <perex@perex.cz> Link: https://lore.kernel.org/r/20230523075358.9672-18-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
1 parent f4487c4 commit f80e6d6

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

sound/core/seq/seq_memory.c

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,16 @@ int snd_seq_expand_var_event(const struct snd_seq_event *event, int count, char
152152
return -EINVAL;
153153
if (copy_from_user(buf, (void __force __user *)event->data.ext.ptr, len))
154154
return -EFAULT;
155-
return newlen;
155+
} else {
156+
err = snd_seq_dump_var_event(event,
157+
in_kernel ? seq_copy_in_kernel : seq_copy_in_user,
158+
&buf);
159+
if (err < 0)
160+
return err;
156161
}
157-
err = snd_seq_dump_var_event(event,
158-
in_kernel ? seq_copy_in_kernel : seq_copy_in_user,
159-
&buf);
160-
return err < 0 ? err : newlen;
162+
if (len != newlen)
163+
memset(buf + len, 0, newlen - len);
164+
return newlen;
161165
}
162166
EXPORT_SYMBOL(snd_seq_expand_var_event);
163167

0 commit comments

Comments
 (0)