Skip to content

Commit ba0a5a3

Browse files
committed
Merge tag 'firewire-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
Pull a firewire fix from Stefan Richter: "Fixes an old bug of the /dev/fw* ioctl ABI." * tag 'firewire-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394: firewire: cdev: fix user memory corruption (i386 userland on amd64 kernel)
2 parents 3dddebe + 790198f commit ba0a5a3

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

‎drivers/firewire/core-cdev.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -473,8 +473,8 @@ static int ioctl_get_info(struct client *client, union ioctl_arg *arg)
473473
client->bus_reset_closure = a->bus_reset_closure;
474474
if (a->bus_reset != 0) {
475475
fill_bus_reset_event(&bus_reset, client);
476-
ret = copy_to_user(u64_to_uptr(a->bus_reset),
477-
&bus_reset, sizeof(bus_reset));
476+
/* unaligned size of bus_reset is 36 bytes */
477+
ret = copy_to_user(u64_to_uptr(a->bus_reset), &bus_reset, 36);
478478
}
479479
if (ret == 0 && list_empty(&client->link))
480480
list_add_tail(&client->link, &client->device->client_list);

0 commit comments

Comments
 (0)