mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH 08/10] oss: midi_synth: check get_user() return value
@ 2010-07-28 16:41 Kulikov Vasiliy
  2010-07-29 10:31 ` Takashi Iwai
  0 siblings, 1 reply; 2+ messages in thread
From: Kulikov Vasiliy @ 2010-07-28 16:41 UTC (permalink / raw)
  To: kernel-janitors
  Cc: Jaroslav Kysela, Takashi Iwai, Roel Kluin, alsa-devel, linux-kernel

get_user() may fail, if so return -EFAULT.

Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
---
 sound/oss/midi_synth.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/sound/oss/midi_synth.c b/sound/oss/midi_synth.c
index 3bc7104..3c09374 100644
--- a/sound/oss/midi_synth.c
+++ b/sound/oss/midi_synth.c
@@ -523,7 +523,9 @@ midi_synth_load_patch(int dev, int format, const char __user *addr,
 	{
 		unsigned char   data;
 
-		get_user(*(unsigned char *) &data, (unsigned char __user *) &((addr)[hdr_size + i]));
+		if (get_user(data,
+		    (unsigned char __user *)(addr + hdr_size + i)))
+			return -EFAULT;
 
 		eox_seen = (i > 0 && data & 0x80);	/* End of sysex */
 
-- 
1.7.0.4


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH 08/10] oss: midi_synth: check get_user() return value
  2010-07-28 16:41 [PATCH 08/10] oss: midi_synth: check get_user() return value Kulikov Vasiliy
@ 2010-07-29 10:31 ` Takashi Iwai
  0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2010-07-29 10:31 UTC (permalink / raw)
  To: Kulikov Vasiliy
  Cc: kernel-janitors, Jaroslav Kysela, Roel Kluin, alsa-devel, linux-kernel

At Wed, 28 Jul 2010 20:41:17 +0400,
Kulikov Vasiliy wrote:
> 
> get_user() may fail, if so return -EFAULT.
> 
> Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>

Applied now.  Thanks.


Takashi


> ---
>  sound/oss/midi_synth.c |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/sound/oss/midi_synth.c b/sound/oss/midi_synth.c
> index 3bc7104..3c09374 100644
> --- a/sound/oss/midi_synth.c
> +++ b/sound/oss/midi_synth.c
> @@ -523,7 +523,9 @@ midi_synth_load_patch(int dev, int format, const char __user *addr,
>  	{
>  		unsigned char   data;
>  
> -		get_user(*(unsigned char *) &data, (unsigned char __user *) &((addr)[hdr_size + i]));
> +		if (get_user(data,
> +		    (unsigned char __user *)(addr + hdr_size + i)))
> +			return -EFAULT;
>  
>  		eox_seen = (i > 0 && data & 0x80);	/* End of sysex */
>  
> -- 
> 1.7.0.4
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-07-29 10:31 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-07-28 16:41 [PATCH 08/10] oss: midi_synth: check get_user() return value Kulikov Vasiliy
2010-07-29 10:31 ` Takashi Iwai

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®