diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
| commit | bb803cfbecb03a0cf8dc7e1864f18dda6631af00 (patch) | |
| tree | 6c0989693bea6f50cfa5c6bb14f52ec19668def3 /sound/core/timer.c | |
| parent | 3878fb6fdbceecca20b15748f807340854220f06 (diff) | |
| parent | 511e11e396dc596825ce04d53d7f6d579404bc01 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/scsi/fcoe/fcoe.c
Diffstat (limited to 'sound/core/timer.c')
| -rw-r--r-- | sound/core/timer.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c index 3f0050d0b71e..8f8b17ac074d 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c | |||
| @@ -1395,13 +1395,10 @@ static int snd_timer_user_ginfo(struct file *file, | |||
| 1395 | struct list_head *p; | 1395 | struct list_head *p; |
| 1396 | int err = 0; | 1396 | int err = 0; |
| 1397 | 1397 | ||
| 1398 | ginfo = kmalloc(sizeof(*ginfo), GFP_KERNEL); | 1398 | ginfo = memdup_user(_ginfo, sizeof(*ginfo)); |
| 1399 | if (! ginfo) | 1399 | if (IS_ERR(ginfo)) |
| 1400 | return -ENOMEM; | 1400 | return PTR_ERR(ginfo); |
| 1401 | if (copy_from_user(ginfo, _ginfo, sizeof(*ginfo))) { | 1401 | |
| 1402 | kfree(ginfo); | ||
| 1403 | return -EFAULT; | ||
| 1404 | } | ||
| 1405 | tid = ginfo->tid; | 1402 | tid = ginfo->tid; |
| 1406 | memset(ginfo, 0, sizeof(*ginfo)); | 1403 | memset(ginfo, 0, sizeof(*ginfo)); |
| 1407 | ginfo->tid = tid; | 1404 | ginfo->tid = tid; |