diff options
| author | Julia Lawall <julia@diku.dk> | 2010-06-04 16:11:17 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-09 03:17:53 -0700 |
| commit | 7d543d8468348c44010c7b4e6fdd23a398779668 (patch) | |
| tree | 8d38259d1d2d4a6a8fca966f4c134e75e50b3df1 /drivers/ide | |
| parent | 2a800b7bd926c739c07c1690579f03bbd6f1b5a3 (diff) | |
| download | linux-stable-7d543d8468348c44010c7b4e6fdd23a398779668.tar.gz linux-stable-7d543d8468348c44010c7b4e6fdd23a398779668.tar.bz2 linux-stable-7d543d8468348c44010c7b4e6fdd23a398779668.zip | |
drivers/ide: Use memdup_user
Use memdup_user when user data is immediately copied into the
allocated region.
The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
expression from,to,size,flag;
position p;
identifier l1,l2;
@@
- to = \(kmalloc@p\|kzalloc@p\)(size,flag);
+ to = memdup_user(from,size);
if (
- to==NULL
+ IS_ERR(to)
|| ...) {
<+... when != goto l1;
- -ENOMEM
+ PTR_ERR(to)
...+>
}
- if (copy_from_user(to, from, size) != 0) {
- <+... when != goto l2;
- -EFAULT
- ...+>
- }
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/ide-taskfile.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c index 67fb73559fd5..34b9872f35d1 100644 --- a/drivers/ide/ide-taskfile.c +++ b/drivers/ide/ide-taskfile.c @@ -480,13 +480,9 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg) u16 nsect = 0; char __user *buf = (char __user *)arg; - req_task = kzalloc(tasksize, GFP_KERNEL); - if (req_task == NULL) - return -ENOMEM; - if (copy_from_user(req_task, buf, tasksize)) { - kfree(req_task); - return -EFAULT; - } + req_task = memdup_user(buf, tasksize); + if (IS_ERR(req_task)) + return PTR_ERR(req_task); taskout = req_task->out_size; taskin = req_task->in_size; |