Skip to content

Commit

Permalink
drm: use memdup_user() as a cleanup
Browse files Browse the repository at this point in the history
drivers/gpu/drm/r128/r128_state.c:1014:10-17: WARNING opportunity for memdup_user
/c/kernel-tests/src/cocci/drivers/gpu/drm/r128/r128_state.c:1029:9-16: WARNING opportunity for memdup_user
/c/kernel-tests/src/cocci/drivers/gpu/drm/r128/r128_state.c:904:10-17: WARNING opportunity for memdup_user
/c/kernel-tests/src/cocci/drivers/gpu/drm/r128/r128_state.c:914:9-16: WARNING opportunity for memdup_user

 Use memdup_user rather than duplicating its implementation
 This is a little bit restricted to reduce false positives

Generated by: coccinelle/api/memdup_user.cocci

CC: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Dan Carpenter authored and Dave Airlie committed Dec 18, 2013
1 parent 99c09e7 commit d016da5
Showing 1 changed file with 12 additions and 34 deletions.
46 changes: 12 additions & 34 deletions drivers/gpu/drm/r128/r128_state.c
Original file line number Diff line number Diff line change
Expand Up @@ -901,25 +901,16 @@ static int r128_cce_dispatch_write_span(struct drm_device *dev,
return -EFAULT;

buffer_size = depth->n * sizeof(u32);
buffer = kmalloc(buffer_size, GFP_KERNEL);
if (buffer == NULL)
return -ENOMEM;
if (copy_from_user(buffer, depth->buffer, buffer_size)) {
kfree(buffer);
return -EFAULT;
}
buffer = memdup_user(depth->buffer, buffer_size);
if (IS_ERR(buffer))
return PTR_ERR(buffer);

mask_size = depth->n * sizeof(u8);
if (depth->mask) {
mask = kmalloc(mask_size, GFP_KERNEL);
if (mask == NULL) {
mask = memdup_user(depth->mask, mask_size);
if (IS_ERR(mask)) {
kfree(buffer);
return -ENOMEM;
}
if (copy_from_user(mask, depth->mask, mask_size)) {
kfree(buffer);
kfree(mask);
return -EFAULT;
return PTR_ERR(mask);
}

for (i = 0; i < count; i++, x++) {
Expand Down Expand Up @@ -1011,34 +1002,21 @@ static int r128_cce_dispatch_write_pixels(struct drm_device *dev,
}

buffer_size = depth->n * sizeof(u32);
buffer = kmalloc(buffer_size, GFP_KERNEL);
if (buffer == NULL) {
kfree(x);
kfree(y);
return -ENOMEM;
}
if (copy_from_user(buffer, depth->buffer, buffer_size)) {
buffer = memdup_user(depth->buffer, buffer_size);
if (IS_ERR(buffer)) {
kfree(x);
kfree(y);
kfree(buffer);
return -EFAULT;
return PTR_ERR(buffer);
}

if (depth->mask) {
mask_size = depth->n * sizeof(u8);
mask = kmalloc(mask_size, GFP_KERNEL);
if (mask == NULL) {
kfree(x);
kfree(y);
kfree(buffer);
return -ENOMEM;
}
if (copy_from_user(mask, depth->mask, mask_size)) {
mask = memdup_user(depth->mask, mask_size);
if (IS_ERR(mask)) {
kfree(x);
kfree(y);
kfree(buffer);
kfree(mask);
return -EFAULT;
return PTR_ERR(mask);
}

for (i = 0; i < count; i++) {
Expand Down

0 comments on commit d016da5

Please sign in to comment.