From: Greg Kroah-Hartman Date: Tue, 24 Dec 2019 00:22:17 +0000 (-0500) Subject: drop queue-4.4/alsa-pcm-avoid-possible-info-leaks-from-pcm-stream-buffers.patch X-Git-Tag: v4.14.161~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3b37b740986c6b95eed2fa009867b8dd6d9401e2;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-4.4/alsa-pcm-avoid-possible-info-leaks-from-pcm-stream-buffers.patch --- diff --git a/queue-4.4/alsa-pcm-avoid-possible-info-leaks-from-pcm-stream-buffers.patch b/queue-4.4/alsa-pcm-avoid-possible-info-leaks-from-pcm-stream-buffers.patch deleted file mode 100644 index bf72d4c149d..00000000000 --- a/queue-4.4/alsa-pcm-avoid-possible-info-leaks-from-pcm-stream-buffers.patch +++ /dev/null @@ -1,43 +0,0 @@ -From add9d56d7b3781532208afbff5509d7382fb6efe Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Wed, 11 Dec 2019 16:57:42 +0100 -Subject: ALSA: pcm: Avoid possible info leaks from PCM stream buffers - -From: Takashi Iwai - -commit add9d56d7b3781532208afbff5509d7382fb6efe upstream. - -The current PCM code doesn't initialize explicitly the buffers -allocated for PCM streams, hence it might leak some uninitialized -kernel data or previous stream contents by mmapping or reading the -buffer before actually starting the stream. - -Since this is a common problem, this patch simply adds the clearance -of the buffer data at hw_params callback. Although this does only -zero-clear no matter which format is used, which doesn't mean the -silence for some formats, but it should be OK because the intention is -just to clear the previous data on the buffer. - -Reported-by: Lionel Koenig -Cc: -Link: https://lore.kernel.org/r/20191211155742.3213-1-tiwai@suse.de -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman - ---- - sound/core/pcm_native.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/sound/core/pcm_native.c -+++ b/sound/core/pcm_native.c -@@ -587,6 +587,10 @@ static int snd_pcm_hw_params(struct snd_ - while (runtime->boundary * 2 <= LONG_MAX - runtime->buffer_size) - runtime->boundary *= 2; - -+ /* clear the buffer for avoiding possible kernel info leaks */ -+ if (runtime->dma_area && !substream->ops->copy_user) -+ memset(runtime->dma_area, 0, runtime->dma_bytes); -+ - snd_pcm_timer_resolution_change(substream); - snd_pcm_set_state(substream, SNDRV_PCM_STATE_SETUP); - diff --git a/queue-4.4/series b/queue-4.4/series index f830fd1e801..6447f58f7ce 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -1,6 +1,5 @@ btrfs-do-not-leak-reloc-root-if-we-fail-to-read-the-fs-root.patch btrfs-handle-enoent-in-btrfs_uuid_tree_iterate.patch -alsa-pcm-avoid-possible-info-leaks-from-pcm-stream-buffers.patch alsa-hda-ca0132-keep-power-on-during-processing-dsp-response.patch alsa-hda-ca0132-avoid-endless-loop.patch drm-mst-fix-query_payload-ack-reply-struct.patch