diff options
| author | Tony Lindgren <tony@atomide.com> | 2020-06-16 09:25:03 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2020-06-16 09:25:03 -0700 |
| commit | 07c7b547a79605f1041d55b84d91a4a4d9c5b363 (patch) | |
| tree | d98c1adacc8c65b475c325b427e54b8205b0013d /drivers/firewire/core-cdev.c | |
| parent | e4a8fc054340f4df761f6a73335f8fdc0b7ac4fd (diff) | |
| parent | b3a9e3b9622ae10064826dccb4f7a52bd88c7407 (diff) | |
| download | linux-07c7b547a79605f1041d55b84d91a4a4d9c5b363.tar.gz linux-07c7b547a79605f1041d55b84d91a4a4d9c5b363.tar.bz2 linux-07c7b547a79605f1041d55b84d91a4a4d9c5b363.zip | |
Merge tag 'v5.8-rc1' into fixes
Linux 5.8-rc1
Diffstat (limited to 'drivers/firewire/core-cdev.c')
| -rw-r--r-- | drivers/firewire/core-cdev.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c index 6e291d8f3a27..c7ea4f2d5ca6 100644 --- a/drivers/firewire/core-cdev.c +++ b/drivers/firewire/core-cdev.c @@ -1081,8 +1081,6 @@ static int ioctl_queue_iso(struct client *client, union ioctl_arg *arg) return -EINVAL; p = (struct fw_cdev_iso_packet __user *)u64_to_uptr(a->packets); - if (!access_ok(p, a->size)) - return -EFAULT; end = (void __user *)p + a->size; count = 0; @@ -1120,7 +1118,7 @@ static int ioctl_queue_iso(struct client *client, union ioctl_arg *arg) &p->header[transmit_header_bytes / 4]; if (next > end) return -EINVAL; - if (__copy_from_user + if (copy_from_user (u.packet.header, p->header, transmit_header_bytes)) return -EFAULT; if (u.packet.skip && ctx->type == FW_ISO_CONTEXT_TRANSMIT && |