From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 1 Feb 2016 11:04:55 +0000 (+0100)
Subject: ALSA: rawmidi: Remove kernel WARNING for NULL user-space buffer check
X-Git-Tag: v4.1.12-92~150^2~249
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cdfa02ddd57547ad5286a609d520af5309406119;p=users%2Fjedix%2Flinux-maple.git

ALSA: rawmidi: Remove kernel WARNING for NULL user-space buffer check

Orabug: 23330800

[ Upstream commit cc85f7a634cfaf9f0713c6aa06d08817424db37a ]

NULL user-space buffer can be passed even in a normal path, thus it's
not good to spew a kernel warning with stack trace at each time.
Just drop snd_BUG_ON() macro usage there.

BugLink: http://lkml.kernel.org/r/CACT4Y+YfVJ3L+q0i-4vyQVyyPD7V=OMX0PWPi29x9Bo3QaBLdw@mail.gmail.com
Reported-by: Dmitry Vyukov <dvyukov@google.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit 216b6d4f24b88ab70c58e0574e30b8da1b2b053b)

Signed-off-by: Dan Duval <dan.duval@oracle.com>
---

diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c
index a7759846fbaad..f75d1656272c8 100644
--- a/sound/core/rawmidi.c
+++ b/sound/core/rawmidi.c
@@ -1178,7 +1178,7 @@ static long snd_rawmidi_kernel_write1(struct snd_rawmidi_substream *substream,
 	long count1, result;
 	struct snd_rawmidi_runtime *runtime = substream->runtime;
 
-	if (snd_BUG_ON(!kernelbuf && !userbuf))
+	if (!kernelbuf && !userbuf)
 		return -EINVAL;
 	if (snd_BUG_ON(!runtime->buffer))
 		return -EINVAL;