diff --git a/[refs] b/[refs] index cc3784bdf3e4..849e4c7c2b0c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5157cc8113db3de60ab6320965331c63bc77003c +refs/heads/master: b3390ceab95601afc12213c3ec5551d3bc7b638f diff --git a/trunk/sound/oss/midi_synth.c b/trunk/sound/oss/midi_synth.c index 3bc7104c5379..3c09374ea5bf 100644 --- a/trunk/sound/oss/midi_synth.c +++ b/trunk/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 */