[PATCH] firewire:queue the right number of data

From: JiSheng Zhang
Date: Sat Jul 19 2008 - 03:37:22 EST


There will be 4 padding bytes in struct fw_cdev_event_response on some platforms
The member:__u32 data will point to these padding bytes. While queue the
response and data in complete_transaction in fw-cdev.c, it will queue like this:
|response(excluding padding bytes)|4 padding bytes|4 padding bytes|data.
It queue 4 extra bytes. That is to say it use "&response + sizeof(response)"
while other place of kernel and userspace library use "&response + offsetof
(typeof(response), data)". So it will lost the last 4 bytes of data.This patch
can fix it while not changing the struct definition.

Sorry for open a new ticket.

Signed-off-by: JiSheng Zhang <jszhang3@xxxxxxxxxxxxxxxx>

--- old/drivers/firewire/fw-cdev.c
+++ new/drivers/firewire/fw-cdev.c
@@ -382,9 +382,9 @@

response->response.type = FW_CDEV_EVENT_RESPONSE;
response->response.rcode = rcode;
- queue_event(client, &response->event,
- &response->response, sizeof(response->response),
- response->response.data, response->response.length);
+ queue_event(client, &response->event, &response->response,
+ sizeof(response->response) + response->response.length,
+ NULL, 0);

static int ioctl_send_request(struct client *client, void *buffer)
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/