Skip to content

Commit

Permalink
HID: sony: Prevent the freeing of an unitialized ida value
Browse files Browse the repository at this point in the history
sony_allocate_output_report() was being called before sony_set_device_id()
which meant that an unallocated ida value was was freed if the output
report allocation failed and the probe function jumped to err_stop.

Do the device ID allocation before the output report allocation to avoid
freeing an unallocated value in case of a failure.

Signed-off-by: Frank Praznik <frank.praznik@oh.rr.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  • Loading branch information
Frank Praznik authored and Jiri Kosina committed May 7, 2015
1 parent 8de29a3 commit 131a8a9
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/hid/hid-sony.c
Original file line number Diff line number Diff line change
Expand Up @@ -1993,15 +1993,15 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
return ret;
}

ret = sony_allocate_output_report(sc);
ret = sony_set_device_id(sc);
if (ret < 0) {
hid_err(hdev, "failed to allocate the output report buffer\n");
hid_err(hdev, "failed to allocate the device id\n");
goto err_stop;
}

ret = sony_set_device_id(sc);
ret = sony_allocate_output_report(sc);
if (ret < 0) {
hid_err(hdev, "failed to allocate the device id\n");
hid_err(hdev, "failed to allocate the output report buffer\n");
goto err_stop;
}

Expand Down

0 comments on commit 131a8a9

Please sign in to comment.