diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-04-15 11:24:27 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-04-15 11:24:27 +0200 |
commit | f4723b224d21ff546ac1fea4483094548d529479 (patch) | |
tree | 1257dceebcacbf04d3cd6eabf7ff75cfac2edd96 /sound/core/seq/seq_compat.c | |
parent | 00610a81df32ea50dba0105078e7369988caef3b (diff) | |
parent | 336500f0305dc1552e8d01a60b409a7db781ca28 (diff) |
Merge branch 'topic/memdup_user' into for-linus
* topic/memdup_user:
ALSA: sound/pci: use memdup_user()
ALSA: sound/usb: use memdup_user()
ALSA: sound/isa: use memdup_user()
ALSA: sound/core: use memdup_user()
Diffstat (limited to 'sound/core/seq/seq_compat.c')
-rw-r--r-- | sound/core/seq/seq_compat.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/core/seq/seq_compat.c b/sound/core/seq/seq_compat.c index 38693f47c262..c956fe462569 100644 --- a/sound/core/seq/seq_compat.c +++ b/sound/core/seq/seq_compat.c @@ -48,12 +48,11 @@ static int snd_seq_call_port_info_ioctl(struct snd_seq_client *client, unsigned struct snd_seq_port_info *data; mm_segment_t fs; - data = kmalloc(sizeof(*data), GFP_KERNEL); - if (! data) - return -ENOMEM; + data = memdup_user(data32, sizeof(*data32)); + if (IS_ERR(data)) + return PTR_ERR(data); - if (copy_from_user(data, data32, sizeof(*data32)) || - get_user(data->flags, &data32->flags) || + if (get_user(data->flags, &data32->flags) || get_user(data->time_queue, &data32->time_queue)) goto error; data->kernel = NULL; |