|
@@ -2119,11 +2119,6 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
|
|
|
if (!nr)
|
|
|
return -ENOMEM;
|
|
|
|
|
|
- if (!access_ok(VERIFY_WRITE, ubuf, nframes * CD_FRAMESIZE_RAW)) {
|
|
|
- ret = -EFAULT;
|
|
|
- goto out;
|
|
|
- }
|
|
|
-
|
|
|
cgc.data_direction = CGC_DATA_READ;
|
|
|
while (nframes > 0) {
|
|
|
if (nr > nframes)
|
|
@@ -2132,7 +2127,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
|
|
|
ret = cdrom_read_block(cdi, &cgc, lba, nr, 1, CD_FRAMESIZE_RAW);
|
|
|
if (ret)
|
|
|
break;
|
|
|
- if (__copy_to_user(ubuf, cgc.buffer, CD_FRAMESIZE_RAW * nr)) {
|
|
|
+ if (copy_to_user(ubuf, cgc.buffer, CD_FRAMESIZE_RAW * nr)) {
|
|
|
ret = -EFAULT;
|
|
|
break;
|
|
|
}
|
|
@@ -2140,7 +2135,6 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
|
|
|
nframes -= nr;
|
|
|
lba += nr;
|
|
|
}
|
|
|
-out:
|
|
|
kfree(cgc.buffer);
|
|
|
return ret;
|
|
|
}
|