summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-02-01 12:04:55 +0100
committerWilly Tarreau <w@1wt.eu>2016-03-12 14:25:45 +0100
commit51a155faf4bbaa05cf279192f8ff47733933d85f (patch)
tree4e31a98f060a0eff9ac262346c2c458fd7921080 /sound
parent92b51a4da1c46bdd9897dda12ca569856c0a93d7 (diff)
downloadlwn-51a155faf4bbaa05cf279192f8ff47733933d85f.tar.gz
lwn-51a155faf4bbaa05cf279192f8ff47733933d85f.zip
ALSA: rawmidi: Remove kernel WARNING for NULL user-space buffer check
commit cc85f7a634cfaf9f0713c6aa06d08817424db37a upstream. 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> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'sound')
-rw-r--r--sound/core/rawmidi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c
index e4c12a1ee304..07aed6b27543 100644
--- a/sound/core/rawmidi.c
+++ b/sound/core/rawmidi.c
@@ -1160,7 +1160,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;