Skip to content

Commit

Permalink
ieee1394: raw1394: Fix async send
Browse files Browse the repository at this point in the history
While playing with libiec61883 I've noticed that async_send is broken
because it was doing copy_from_user(...., packet->data_size) before
packet->data_size was set to any useful value.  It got broken when
packet->allocated_data_size got introduced, as hpsb_alloc_packet does
not set packet->data_size anymore.  (Regression in 2.6.22-rc1)

Signed-off-by: Petr Vandrovec <petr@vandrovec.name>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
  • Loading branch information
Petr Vandrovec authored and Stefan Richter committed May 27, 2007
1 parent ef50a6c commit 976da96
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/ieee1394/raw1394.c
Original file line number Diff line number Diff line change
Expand Up @@ -936,6 +936,7 @@ static int handle_async_send(struct file_info *fi, struct pending_request *req)
struct hpsb_packet *packet;
int header_length = req->req.misc & 0xffff;
int expect_response = req->req.misc >> 16;
size_t data_size;

if (header_length > req->req.length || header_length < 12 ||
header_length > FIELD_SIZEOF(struct hpsb_packet, header)) {
Expand All @@ -945,7 +946,8 @@ static int handle_async_send(struct file_info *fi, struct pending_request *req)
return sizeof(struct raw1394_request);
}

packet = hpsb_alloc_packet(req->req.length - header_length);
data_size = req->req.length - header_length;
packet = hpsb_alloc_packet(data_size);
req->packet = packet;
if (!packet)
return -ENOMEM;
Expand All @@ -960,7 +962,7 @@ static int handle_async_send(struct file_info *fi, struct pending_request *req)

if (copy_from_user
(packet->data, int2ptr(req->req.sendb) + header_length,
packet->data_size)) {
data_size)) {
req->req.error = RAW1394_ERROR_MEMFAULT;
req->req.length = 0;
queue_complete_req(req);
Expand All @@ -974,7 +976,7 @@ static int handle_async_send(struct file_info *fi, struct pending_request *req)
packet->host = fi->host;
packet->expect_response = expect_response;
packet->header_size = header_length;
packet->data_size = req->req.length - header_length;
packet->data_size = data_size;

req->req.length = 0;
hpsb_set_packet_complete_task(packet,
Expand Down

0 comments on commit 976da96

Please sign in to comment.