Merge branch 'linus' into irq/core

[profile/ivi/kernel-adaptation-intel-automotive.git] / sound / oss / midi_synth.c

diff --git a/sound/oss/midi_synth.c b/sound/oss/midi_synth.c
index 3bc7104..3c09374 100644 (file)
--- 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 */