Skip to content

Commit

Permalink
firewire: fix NULL pointer deref. and resource leak
Browse files Browse the repository at this point in the history
By supplying ioctl()s in the wrong order, a userspace client was able to
trigger NULL pointer dereferences.  Furthermore, by calling
ioctl_create_iso_context more than once, new contexts could be created
without ever freeing the previously created contexts.

Thanks to Anders Blomdell for the report.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
  • Loading branch information
Stefan Richter committed Feb 21, 2008
1 parent 09d7328 commit fae6031
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions drivers/firewire/fw-cdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,10 @@ static int ioctl_create_iso_context(struct client *client, void *buffer)
struct fw_cdev_create_iso_context *request = buffer;
struct fw_iso_context *context;

/* We only support one context at this time. */
if (client->iso_context != NULL)
return -EBUSY;

if (request->channel > 63)
return -EINVAL;

Expand Down Expand Up @@ -792,8 +796,9 @@ static int ioctl_start_iso(struct client *client, void *buffer)
{
struct fw_cdev_start_iso *request = buffer;

if (request->handle != 0)
if (client->iso_context == NULL || request->handle != 0)
return -EINVAL;

if (client->iso_context->type == FW_ISO_CONTEXT_RECEIVE) {
if (request->tags == 0 || request->tags > 15)
return -EINVAL;
Expand All @@ -810,7 +815,7 @@ static int ioctl_stop_iso(struct client *client, void *buffer)
{
struct fw_cdev_stop_iso *request = buffer;

if (request->handle != 0)
if (client->iso_context == NULL || request->handle != 0)
return -EINVAL;

return fw_iso_context_stop(client->iso_context);
Expand Down

0 comments on commit fae6031

Please sign in to comment.