Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea4eb1a8 authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman
Browse files

UPSTREAM: ALSA: pcm: Add missing copy ops check before clearing buffer 



[ this is a fix specific to 4.4.y and 4.9.y stable trees;
  4.14.y and older already contain the right fix ]

The stable 4.4.y and 4.9.y backports of the upstream commit
add9d56d7b37 ("ALSA: pcm: Avoid possible info leaks from PCM stream
buffers") dropped the check of substream->ops->copy_user as copy_user
is a new member that isn't present in the older kernels.
Although upstream drivers should work without this NULL check, it may
cause a regression with a downstream driver that sets some
inaccessible address to runtime->dma_area, leading to a crash at
worst.

Since such drivers must have ops->copy member on older kernels instead
of ops->copy_user, this patch adds the missing check of ops->copy for
fixing the regression.

Change-Id: Ib7b856364a75695268f2dfcf3315d92478508ada
Reported-and-tested-by: default avatarAndreas Schneider <asn@cryptomilk.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 7e0f964a

sound/core/pcm_native.c

+1 −1
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream, 
		runtime->boundary *= 2;



	/* clear the buffer for avoiding possible kernel info leaks */

	if (runtime->dma_area)

	if (runtime->dma_area && !substream->ops->copy)

		memset(runtime->dma_area, 0, runtime->dma_bytes);



	snd_pcm_timer_resolution_change(substream);