From cb56281fc9892e460e668002442acbae06cf6599 Mon Sep 17 00:00:00 2001 From: Kulikov Vasiliy Date: Wed, 28 Jul 2010 20:40:51 +0400 Subject: [PATCH] --- yaml --- r: 206693 b: refs/heads/master c: 5157cc8113db3de60ab6320965331c63bc77003c h: refs/heads/master i: 206691: 92b3737d8fd96f79f933add866cdc472df86bda6 v: v3 --- [refs] | 2 +- trunk/sound/isa/sb/emu8000_pcm.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 25cb6554e999..cc3784bdf3e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 63818c448ac6f4dd75aa42997acaa746f86acb6b +refs/heads/master: 5157cc8113db3de60ab6320965331c63bc77003c diff --git a/trunk/sound/isa/sb/emu8000_pcm.c b/trunk/sound/isa/sb/emu8000_pcm.c index ccedbfed061a..2f85c66f8e38 100644 --- a/trunk/sound/isa/sb/emu8000_pcm.c +++ b/trunk/sound/isa/sb/emu8000_pcm.c @@ -433,7 +433,8 @@ static int emu8k_transfer_block(struct snd_emu8000 *emu, int offset, unsigned sh while (count > 0) { unsigned short sval; CHECK_SCHEDULER(); - get_user(sval, buf); + if (get_user(sval, buf)) + return -EFAULT; EMU8000_SMLD_WRITE(emu, sval); buf++; count--; @@ -525,12 +526,14 @@ static int emu8k_pcm_copy(struct snd_pcm_substream *subs, while (count-- > 0) { unsigned short sval; CHECK_SCHEDULER(); - get_user(sval, buf); + if (get_user(sval, buf)) + return -EFAULT; EMU8000_SMLD_WRITE(emu, sval); buf++; if (rec->voices > 1) { CHECK_SCHEDULER(); - get_user(sval, buf); + if (get_user(sval, buf)) + return -EFAULT; EMU8000_SMRD_WRITE(emu, sval); buf++; }