|
@@ -1001,15 +1001,9 @@ int savage_bci_cmdbuf(struct drm_device *dev, void *data, struct drm_file *file_
|
|
cmdbuf->cmd_addr = kcmd_addr;
|
|
cmdbuf->cmd_addr = kcmd_addr;
|
|
}
|
|
}
|
|
if (cmdbuf->vb_size) {
|
|
if (cmdbuf->vb_size) {
|
|
- kvb_addr = kmalloc(cmdbuf->vb_size, GFP_KERNEL);
|
|
|
|
- if (kvb_addr == NULL) {
|
|
|
|
- ret = -ENOMEM;
|
|
|
|
- goto done;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (copy_from_user(kvb_addr, cmdbuf->vb_addr,
|
|
|
|
- cmdbuf->vb_size)) {
|
|
|
|
- ret = -EFAULT;
|
|
|
|
|
|
+ kvb_addr = memdup_user(cmdbuf->vb_addr, cmdbuf->vb_size);
|
|
|
|
+ if (IS_ERR(kvb_addr)) {
|
|
|
|
+ ret = PTR_ERR(kvb_addr);
|
|
goto done;
|
|
goto done;
|
|
}
|
|
}
|
|
cmdbuf->vb_addr = kvb_addr;
|
|
cmdbuf->vb_addr = kvb_addr;
|