Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-11-07 04:09:21 +00:00
Code Issues Projects Releases Wiki Activity

firewire: cdev: fix memory leak in an error path

Browse source 
If copy_from_user in an FW_CDEV_IOC_SEND_RESPONSE ioctl failed, an
inbound_transaction_resource instance is no longer referenced and needs
to be freed.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Stefan Richter 2009-10-08 00:39:56 +02:00
parent eaf76e0d02
commit 7e44c0b56b
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/firewire/core-cdev.c
View file

@ -698,6 +698,7 @@ static int ioctl_send_response(struct client *client, void *buffer)
struct fw_cdev_send_response *request = buffer; struct fw_cdev_send_response *request = buffer;
struct client_resource *resource; struct client_resource *resource;
struct inbound_transaction_resource *r; struct inbound_transaction_resource *r;
int ret = 0;
if (release_client_resource(client, request->handle, if (release_client_resource(client, request->handle,
release_request, &resource) < 0) release_request, &resource) < 0)
@ -707,13 +708,17 @@ static int ioctl_send_response(struct client *client, void *buffer)
resource); resource);
if (request->length < r->length) if (request->length < r->length)
r->length = request->length; r->length = request->length;
if (copy_from_user(r->data, u64_to_uptr(request->data), r->length))
return -EFAULT; if (copy_from_user(r->data, u64_to_uptr(request->data), r->length)) {
ret = -EFAULT;
goto out;
}
fw_send_response(client->device->card, r->request, request->rcode); fw_send_response(client->device->card, r->request, request->rcode);
out:
kfree(r); kfree(r);
return 0; return ret;
} }
static int ioctl_initiate_bus_reset(struct client *client, void *buffer) static int ioctl_initiate_bus_reset(struct client *client, void *buffer)