提交 f9543d0a 编写于 作者: J JiSheng Zhang 提交者: Stefan Richter

firewire: queue the right number of data

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.
Signed-off-by: NJiSheng Zhang <jszhang3@mail.ustc.edu.cn>

This fixes responses to outbound block read requests on 64bit architectures.
Tested on i686, x86-64, and x86-64 with i686 userland, using firecontrol and
gscanbus.
Signed-off-by: NStefan Richter <stefanr@s5r6.in-berlin.de>
上级 1e8afea1
...@@ -382,9 +382,9 @@ complete_transaction(struct fw_card *card, int rcode, ...@@ -382,9 +382,9 @@ complete_transaction(struct fw_card *card, int rcode,
response->response.type = FW_CDEV_EVENT_RESPONSE; response->response.type = FW_CDEV_EVENT_RESPONSE;
response->response.rcode = rcode; response->response.rcode = rcode;
queue_event(client, &response->event, queue_event(client, &response->event, &response->response,
&response->response, sizeof(response->response), sizeof(response->response) + response->response.length,
response->response.data, response->response.length); NULL, 0);
} }
static int ioctl_send_request(struct client *client, void *buffer) static int ioctl_send_request(struct client *client, void *buffer)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册