From: Jesper Juhl <juhl-lkml@dif.dk>
This patch converts the first half of drivers from verify_area to
access_ok.
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/drivers/block/nbd.c | 2 +-
25-akpm/drivers/block/viodasd.c | 6 ++----
25-akpm/drivers/bluetooth/hci_vhci.c | 4 ++--
25-akpm/drivers/cdrom/cdu31a.c | 8 +++-----
25-akpm/drivers/cdrom/sbpcd.c | 6 +++---
25-akpm/drivers/cdrom/sjcd.c | 16 ++++++++--------
25-akpm/drivers/char/generic_nvram.c | 4 ++--
25-akpm/drivers/char/n_hdlc.c | 10 ++++------
25-akpm/drivers/char/nwflash.c | 2 +-
25-akpm/drivers/char/rio/rio_linux.c | 16 ++++++++++------
25-akpm/drivers/char/selection.c | 2 +-
25-akpm/drivers/char/vt_ioctl.c | 12 +++++-------
25-akpm/drivers/ieee1394/raw1394.c | 4 ++--
25-akpm/drivers/isdn/act2000/act2000_isa.c | 7 +++----
25-akpm/drivers/isdn/i4l/isdn_common.c | 28 ++++++++++++++--------------
25-akpm/drivers/isdn/i4l/isdn_ppp.c | 12 ++++--------
25-akpm/drivers/isdn/icn/icn.c | 5 ++---
25-akpm/drivers/isdn/isdnloop/isdnloop.c | 4 ++--
25-akpm/drivers/macintosh/adb.c | 12 +++++-------
25-akpm/drivers/macintosh/ans-lcd.c | 2 +-
25-akpm/drivers/macintosh/nvram.c | 4 ++--
25-akpm/drivers/macintosh/via-pmu.c | 7 +++----
25-akpm/drivers/media/video/c-qcam.c | 2 +-
23 files changed, 81 insertions(+), 94 deletions(-)
diff -puN drivers/block/nbd.c~verify_area-cleanup-drivers-part-1 drivers/block/nbd.c
--- 25/drivers/block/nbd.c~verify_area-cleanup-drivers-part-1 2005-03-11 11:46:41.000000000 -0800
+++ 25-akpm/drivers/block/nbd.c 2005-03-11 11:46:41.000000000 -0800
@@ -38,7 +38,7 @@
* 03-06-24 Cleanup PARANOIA usage & code. <ldl@aros.net>
* 04-02-19 Remove PARANOIA, plus various cleanups (Paul Clements)
* possible FIXME: make set_sock / set_blksize / set_size / do_it one syscall
- * why not: would need verify_area and friends, would share yet another
+ * why not: would need access_ok and friends, would share yet another
* structure with userland
*/
diff -puN drivers/block/viodasd.c~verify_area-cleanup-drivers-part-1 drivers/block/viodasd.c
--- 25/drivers/block/viodasd.c~verify_area-cleanup-drivers-part-1 2005-03-11 11:46:41.000000000 -0800
+++ 25-akpm/drivers/block/viodasd.c 2005-03-11 11:46:41.000000000 -0800
@@ -250,7 +250,6 @@ static int viodasd_release(struct inode
static int viodasd_ioctl(struct inode *ino, struct file *fil,
unsigned int cmd, unsigned long arg)
{
- int err;
unsigned char sectors;
unsigned char heads;
unsigned short cylinders;
@@ -263,9 +262,8 @@ static int viodasd_ioctl(struct inode *i
geo = (struct hd_geometry *)arg;
if (geo == NULL)
return -EINVAL;
- err = verify_area(VERIFY_WRITE, geo, sizeof(*geo));
- if (err)
- return err;
+ if (!access_ok(VERIFY_WRITE, geo, sizeof(*geo)))
+ return -EFAULT;
gendisk = ino->i_bdev->bd_disk;
d = gendisk->private_data;
sectors = d->sectors;
diff -puN drivers/bluetooth/hci_vhci.c~verify_area-cleanup-drivers-part-1 drivers/bluetooth/hci_vhci.c
--- 25/drivers/bluetooth/hci_vhci.c~verify_area-cleanup-drivers-part-1 2005-03-11 11:46:41.000000000 -0800
+++ 25-akpm/drivers/bluetooth/hci_vhci.c 2005-03-11 11:46:41.000000000 -0800
@@ -157,7 +157,7 @@ static ssize_t hci_vhci_chr_write(struct
{
struct hci_vhci_struct *hci_vhci = (struct hci_vhci_struct *) file->private_data;
- if (verify_area(VERIFY_READ, buf, count))
+ if (!access_ok(VERIFY_READ, buf, count))
return -EFAULT;
return hci_vhci_get_user(hci_vhci, buf, count);
@@ -222,7 +222,7 @@ static ssize_t hci_vhci_chr_read(struct
continue;
}
- if (!verify_area(VERIFY_WRITE, buf, count))
+ if (access_ok(VERIFY_WRITE, buf, count))
ret = hci_vhci_put_user(hci_vhci, skb, buf, count);
else
ret = -EFAULT;
diff -puN drivers/cdrom/cdu31a.c~verify_area-cleanup-drivers-part-1 drivers/cdrom/cdu31a.c
--- 25/drivers/cdrom/cdu31a.c~verify_area-cleanup-drivers-part-1 2005-03-11 11:46:41.000000000 -0800
+++ 25-akpm/drivers/cdrom/cdu31a.c 2005-03-11 11:46:41.000000000 -0800
@@ -2769,7 +2769,6 @@ static int scd_dev_ioctl(struct cdrom_de
unsigned int cmd, unsigned long arg)
{
void __user *argp = (void __user *)arg;
- int i;
switch (cmd) {
case CDROMREADAUDIO: /* Read 2352 byte audio tracks and 2340 byte
@@ -2790,10 +2789,9 @@ static int scd_dev_ioctl(struct cdrom_de
return 0;
}
- i = verify_area(VERIFY_WRITE, ra.buf,
- CD_FRAMESIZE_RAW * ra.nframes);
- if (i < 0)
- return i;
+ if (!access_ok(VERIFY_WRITE, ra.buf,
+ CD_FRAMESIZE_RAW * ra.nframes))
+ return -EFAULT;
if (ra.addr_format == CDROM_LBA) {
if ((ra.addr.lba >=
diff -puN drivers/cdrom/sbpcd.c~verify_area-cleanup-drivers-part-1 drivers/cdrom/sbpcd.c
--- 25/drivers/cdrom/sbpcd.c~verify_area-cleanup-drivers-part-1 2005-03-11 11:46:41.000000000 -0800
+++ 25-akpm/drivers/cdrom/sbpcd.c 2005-03-11 11:46:41.000000000 -0800
@@ -4266,9 +4266,9 @@ static int sbpcd_dev_ioctl(struct cdrom_
sizeof(struct cdrom_read_audio)))
RETURN_UP(-EFAULT);
if (read_audio.nframes < 0 || read_audio.nframes>current_drive->sbp_audsiz) RETURN_UP(-EINVAL);
- i=verify_area(VERIFY_WRITE, read_audio.buf,
- read_audio.nframes*CD_FRAMESIZE_RAW);
- if (i) RETURN_UP(i);
+ if (!access_ok(VERIFY_WRITE, read_audio.buf,
+ read_audio.nframes*CD_FRAMESIZE_RAW))
+ RETURN_UP(-EFAULT);
if (read_audio.addr_format==CDROM_MSF) /* MSF-bin specification of where to start */
block=msf2lba(&read_audio.addr.msf.minute);
diff -puN drivers/cdrom/sjcd.c~verify_area-cleanup-drivers-part-1 drivers/cdrom/sjcd.c
--- 25/drivers/cdrom/sjcd.c~verify_area-cleanup-drivers-part-1 2005-03-11 11:46:41.000000000 -0800
+++ 25-akpm/drivers/cdrom/sjcd.c 2005-03-11 11:46:41.000000000 -0800
@@ -831,8 +831,8 @@ static int sjcd_ioctl(struct inode *ip,
printk("SJCD: ioctl: playmsf\n");
#endif
if ((s =
- verify_area(VERIFY_READ, argp,
- sizeof(sjcd_msf))) == 0) {
+ access_ok(VERIFY_READ, argp, sizeof(sjcd_msf))
+ ? 0 : -EFAULT) == 0) {
if (sjcd_audio_status == CDROM_AUDIO_PLAY) {
sjcd_send_cmd(SCMD_PAUSE);
(void) sjcd_receive_status();
@@ -888,8 +888,8 @@ static int sjcd_ioctl(struct inode *ip,
printk("SJCD: ioctl: readtocentry\n");
#endif
if ((s =
- verify_area(VERIFY_WRITE, argp,
- sizeof(toc_entry))) == 0) {
+ access_ok(VERIFY_WRITE, argp, sizeof(toc_entry))
+ ? 0 : -EFAULT) == 0) {
struct sjcd_hw_disk_info *tp;
if (copy_from_user(&toc_entry, argp,
@@ -943,8 +943,8 @@ static int sjcd_ioctl(struct inode *ip,
printk("SJCD: ioctl: subchnl\n");
#endif
if ((s =
- verify_area(VERIFY_WRITE, argp,
- sizeof(subchnl))) == 0) {
+ access_ok(VERIFY_WRITE, argp, sizeof(subchnl))
+ ? 0 : -EFAULT) == 0) {
struct sjcd_hw_qinfo q_info;
if (copy_from_user(&subchnl, argp,
@@ -1002,8 +1002,8 @@ static int sjcd_ioctl(struct inode *ip,
printk("SJCD: ioctl: volctrl\n");
#endif
if ((s =
- verify_area(VERIFY_READ, argp,
- sizeof(vol_ctrl))) == 0) {
+ access_ok(VERIFY_READ, argp, sizeof(vol_ctrl))
+ ? 0 : -EFAULT) == 0) {
unsigned char dummy[4];
if (copy_from_user(&vol_ctrl, argp,
diff -puN drivers/char/generic_nvram.c~verify_area-cleanup-drivers-part-1 drivers/char/generic_nvram.c
--- 25/drivers/char/generic_nvram.c~verify_area-cleanup-drivers-part-1 2005-03-11 11:46:41.000000000 -0800
+++ 25-akpm/drivers/char/generic_nvram.c 2005-03-11 11:46:41.000000000 -0800
@@ -51,7 +51,7 @@ static ssize_t read_nvram(struct file *f
unsigned int i;
char __user *p = buf;
- if (verify_area(VERIFY_WRITE, buf, count))
+ if (!access_ok(VERIFY_WRITE, buf, count))
return -EFAULT;
if (*ppos >= NVRAM_SIZE)
return 0;
@@ -69,7 +69,7 @@ static ssize_t write_nvram(struct file *
const char __user *p = buf;
char c;
- if (verify_area(VERIFY_READ, buf, count))
+ if (!access_ok(VERIFY_READ, buf, count))
return -EFAULT;
if (*ppos >= NVRAM_SIZE)
return 0;
diff -puN drivers/char/n_hdlc.c~verify_area-cleanup-drivers-part-1 drivers/char/n_hdlc.c
--- 25/drivers/char/n_hdlc.c~verify_area-cleanup-drivers-part-1 2005-03-11 11:46:41.000000000 -0800
+++ 25-akpm/drivers/char/n_hdlc.c 2005-03-11 11:46:41.000000000 -0800
@@ -575,7 +575,6 @@ static ssize_t n_hdlc_tty_read(struct tt
__u8 __user *buf, size_t nr)
{
struct n_hdlc *n_hdlc = tty2n_hdlc(tty);
- int error;
int ret;
struct n_hdlc_buf *rbuf;
@@ -587,11 +586,10 @@ static ssize_t n_hdlc_tty_read(struct tt
return -EIO;
/* verify user access to buffer */
- error = verify_area (VERIFY_WRITE, buf, nr);
- if (error != 0) {
- printk(KERN_WARNING"%s(%d) n_hdlc_tty_read() can't verify user "
- "buffer\n",__FILE__,__LINE__);
- return (error);
+ if (!access_ok(VERIFY_WRITE, buf, nr)) {
+ printk(KERN_WARNING "%s(%d) n_hdlc_tty_read() can't verify user "
+ "buffer\n", __FILE__, __LINE__);
+ return -EFAULT;
}
for (;;) {
diff -puN drivers/char/nwflash.c~verify_area-cleanup-drivers-part-1 drivers/char/nwflash.c
--- 25/drivers/char/nwflash.c~verify_area-cleanup-drivers-part-1 2005-03-11 11:46:41.000000000 -0800
+++ 25-akpm/drivers/char/nwflash.c 2005-03-11 11:46:41.000000000 -0800
@@ -182,7 +182,7 @@ static ssize_t flash_write(struct file *
if (count > gbFlashSize - p)
count = gbFlashSize - p;
- if (verify_area(VERIFY_READ, buf, count))
+ if (!access_ok(VERIFY_READ, buf, count))
return -EFAULT;
/*
diff -puN drivers/char/rio/rio_linux.c~verify_area-cleanup-drivers-part-1 drivers/char/rio/rio_linux.c
--- 25/drivers/char/rio/rio_linux.c~verify_area-cleanup-drivers-part-1 2005-03-11 11:46:41.000000000 -0800
+++ 25-akpm/drivers/char/rio/rio_linux.c 2005-03-11 11:46:41.000000000 -0800
@@ -681,8 +681,9 @@ static int rio_ioctl (struct tty_struct
}
break;
case TIOCGSERIAL:
- if ((rc = verify_area(VERIFY_WRITE, (void *) arg,
- sizeof(struct serial_struct))) == 0)
+ rc = -EFAULT;
+ if (access_ok(VERIFY_WRITE, (void *) arg,
+ sizeof(struct serial_struct)))
rc = gs_getserial(&PortP->gs, (struct serial_struct *) arg);
break;
case TCSBRK:
@@ -711,8 +712,9 @@ static int rio_ioctl (struct tty_struct
}
break;
case TIOCSSERIAL:
- if ((rc = verify_area(VERIFY_READ, (void *) arg,
- sizeof(struct serial_struct))) == 0)
+ rc = -EFAULT;
+ if (access_ok(VERIFY_READ, (void *) arg,
+ sizeof(struct serial_struct)))
rc = gs_setserial(&PortP->gs, (struct serial_struct *) arg);
break;
#if 0
@@ -722,8 +724,10 @@ static int rio_ioctl (struct tty_struct
* #if 0 disablement predates this comment.
*/
case TIOCMGET:
- if ((rc = verify_area(VERIFY_WRITE, (void *) arg,
- sizeof(unsigned int))) == 0) {
+ rc = -EFAULT;
+ if (access_ok(VERIFY_WRITE, (void *) arg,
+ sizeof(unsigned int))) {
+ rc = 0;
ival = rio_getsignals(port);
put_user(ival, (unsigned int *) arg);
}
diff -puN drivers/char/selection.c~verify_area-cleanup-drivers-part-1 drivers/char/selection.c
--- 25/drivers/char/selection.c~verify_area-cleanup-drivers-part-1 2005-03-11 11:46:41.000000000 -0800
+++ 25-akpm/drivers/char/selection.c 2005-03-11 11:46:41.000000000 -0800
@@ -120,7 +120,7 @@ int set_selection(const struct tiocl_sel
{ unsigned short xs, ys, xe, ye;
- if (verify_area(VERIFY_READ, sel, sizeof(*sel)))
+ if (!access_ok(VERIFY_READ, sel, sizeof(*sel)))
return -EFAULT;
__get_user(xs, &sel->xs);
__get_user(ys, &sel->ys);
diff -puN drivers/char/vt_ioctl.c~verify_area-cleanup-drivers-part-1 drivers/char/vt_ioctl.c
--- 25/drivers/char/vt_ioctl.c~verify_area-cleanup-drivers-part-1 2005-03-11 11:46:41.000000000 -0800
+++ 25-akpm/drivers/char/vt_ioctl.c 2005-03-11 11:46:41.000000000 -0800
@@ -334,15 +334,13 @@ static inline int
do_unimap_ioctl(int cmd, struct unimapdesc __user *user_ud, int perm, struct vc_data *vc)
{
struct unimapdesc tmp;
- int i = 0;
if (copy_from_user(&tmp, user_ud, sizeof tmp))
return -EFAULT;
- if (tmp.entries) {
- i = verify_area(VERIFY_WRITE, tmp.entries,
- tmp.entry_ct*sizeof(struct unipair));
- if (i) return i;
- }
+ if (tmp.entries)
+ if (!access_ok(VERIFY_WRITE, tmp.entries,
+ tmp.entry_ct*sizeof(struct unipair)))
+ return -EFAULT;
switch (cmd) {
case PIO_UNIMAP:
if (!perm)
@@ -859,7 +857,7 @@ int vt_ioctl(struct tty_struct *tty, str
ushort ll,cc,vlin,clin,vcol,ccol;
if (!perm)
return -EPERM;
- if (verify_area(VERIFY_READ, vtconsize,
+ if (!access_ok(VERIFY_READ, vtconsize,
sizeof(struct vt_consize)))
return -EFAULT;
__get_user(ll, &vtconsize->v_rows);
diff -puN drivers/ieee1394/raw1394.c~verify_area-cleanup-drivers-part-1 drivers/ieee1394/raw1394.c
--- 25/drivers/ieee1394/raw1394.c~verify_area-cleanup-drivers-part-1 2005-03-11 11:46:41.000000000 -0800
+++ 25-akpm/drivers/ieee1394/raw1394.c 2005-03-11 11:46:41.000000000 -0800
@@ -2479,7 +2479,7 @@ static int raw1394_iso_recv_packets(stru
return -EINVAL;
/* ensure user-supplied buffer is accessible and big enough */
- if (verify_area(VERIFY_WRITE, upackets.infos,
+ if (!access_ok(VERIFY_WRITE, upackets.infos,
upackets.n_packets *
sizeof(struct raw1394_iso_packet_info)))
return -EFAULT;
@@ -2510,7 +2510,7 @@ static int raw1394_iso_send_packets(stru
return -EINVAL;
/* ensure user-supplied buffer is accessible and big enough */
- if (verify_area(VERIFY_READ, upackets.infos,
+ if (!access_ok(VERIFY_READ, upackets.infos,
upackets.n_packets *
sizeof(struct raw1394_iso_packet_info)))
return -EFAULT;
diff -puN drivers/isdn/act2000/act2000_isa.c~verify_area-cleanup-drivers-part-1 drivers/isdn/act2000/act2000_isa.c
--- 25/drivers/isdn/act2000/act2000_isa.c~verify_area-cleanup-drivers-part-1 2005-03-11 11:46:41.000000000 -0800
+++ 25-akpm/drivers/isdn/act2000/act2000_isa.c 2005-03-11 11:46:41.000000000 -0800
@@ -401,7 +401,6 @@ int
act2000_isa_download(act2000_card * card, act2000_ddef __user * cb)
{
unsigned int length;
- int ret;
int l;
int c;
long timeout;
@@ -413,12 +412,12 @@ act2000_isa_download(act2000_card * card
if (!act2000_isa_reset(card->port))
return -ENXIO;
msleep_interruptible(500);
- if(copy_from_user(&cblock, cb, sizeof(cblock)))
+ if (copy_from_user(&cblock, cb, sizeof(cblock)))
return -EFAULT;
length = cblock.length;
p = cblock.buffer;
- if ((ret = verify_area(VERIFY_READ, p, length)))
- return ret;
+ if (!access_ok(VERIFY_READ, p, length))
+ return -EFAULT;
buf = (u_char *) kmalloc(1024, GFP_KERNEL);
if (!buf)
return -ENOMEM;
diff -puN drivers/isdn/i4l/isdn_common.c~verify_area-cleanup-drivers-part-1 drivers/isdn/i4l/isdn_common.c
--- 25/drivers/isdn/i4l/isdn_common.c~verify_area-cleanup-drivers-part-1 2005-03-11 11:46:41.000000000 -0800
+++ 25-akpm/drivers/isdn/i4l/isdn_common.c 2005-03-11 11:46:41.000000000 -0800
@@ -1180,9 +1180,9 @@ isdn_ioctl(struct inode *inode, struct f
if (arg) {
ulong __user *p = argp;
int i;
- if ((ret = verify_area(VERIFY_WRITE, p,
- sizeof(ulong) * ISDN_MAX_CHANNELS * 2)))
- return ret;
+ if (!access_ok(VERIFY_WRITE, p,
+ sizeof(ulong) * ISDN_MAX_CHANNELS * 2))
+ return -EFAULT;
for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
put_user(dev->ibytes[i], p++);
put_user(dev->obytes[i], p++);
@@ -1420,10 +1420,10 @@ isdn_ioctl(struct inode *inode, struct f
char __user *p = argp;
int i;
- if ((ret = verify_area(VERIFY_WRITE, argp,
+ if (!access_ok(VERIFY_WRITE, argp,
(ISDN_MODEM_NUMREG + ISDN_MSNLEN + ISDN_LMSNLEN)
- * ISDN_MAX_CHANNELS)))
- return ret;
+ * ISDN_MAX_CHANNELS))
+ return -EFAULT;
for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
if (copy_to_user(p, dev->mdm.info[i].emu.profile,
@@ -1447,10 +1447,10 @@ isdn_ioctl(struct inode *inode, struct f
char __user *p = argp;
int i;
- if ((ret = verify_area(VERIFY_READ, argp,
+ if (!access_ok(VERIFY_READ, argp,
(ISDN_MODEM_NUMREG + ISDN_MSNLEN + ISDN_LMSNLEN)
- * ISDN_MAX_CHANNELS)))
- return ret;
+ * ISDN_MAX_CHANNELS))
+ return -EFAULT;
for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
if (copy_from_user(dev->mdm.info[i].emu.profile, p,
@@ -1496,8 +1496,8 @@ isdn_ioctl(struct inode *inode, struct f
int j = 0;
while (1) {
- if ((ret = verify_area(VERIFY_READ, p, 1)))
- return ret;
+ if (!access_ok(VERIFY_READ, p, 1))
+ return -EFAULT;
get_user(bname[j], p++);
switch (bname[j]) {
case '\0':
@@ -1563,9 +1563,9 @@ isdn_ioctl(struct inode *inode, struct f
drvidx = 0;
if (drvidx == -1)
return -ENODEV;
- if ((ret = verify_area(VERIFY_WRITE, argp,
- sizeof(isdn_ioctl_struct))))
- return ret;
+ if (!access_ok(VERIFY_WRITE, argp,
+ sizeof(isdn_ioctl_struct)))
+ return -EFAULT;
c.driver = drvidx;
c.command = ISDN_CMD_IOCTL;
c.arg = cmd;
diff -puN drivers/isdn/i4l/isdn_ppp.c~verify_area-cleanup-drivers-part-1 drivers/isdn/i4l/isdn_ppp.c
--- 25/drivers/isdn/i4l/isdn_ppp.c~verify_area-cleanup-drivers-part-1 2005-03-11 11:46:41.000000000 -0800
+++ 25-akpm/drivers/isdn/i4l/isdn_ppp.c 2005-03-11 11:46:41.000000000 -0800
@@ -764,7 +764,6 @@ isdn_ppp_read(int min, struct file *file
{
struct ippp_struct *is;
struct ippp_buf_queue *b;
- int r;
u_long flags;
u_char *save_buf;
@@ -773,8 +772,8 @@ isdn_ppp_read(int min, struct file *file
if (!(is->state & IPPP_OPEN))
return 0;
- if ((r = verify_area(VERIFY_WRITE, buf, count)))
- return r;
+ if (!access_ok(VERIFY_WRITE, buf, count))
+ return -EFAULT;
spin_lock_irqsave(&is->buflock, flags);
b = is->first->next;
@@ -1995,12 +1994,9 @@ isdn_ppp_dev_ioctl_stats(int slot, struc
struct ppp_stats __user *res = ifr->ifr_data;
struct ppp_stats t;
isdn_net_local *lp = (isdn_net_local *) dev->priv;
- int err;
-
- err = verify_area(VERIFY_WRITE, res, sizeof(struct ppp_stats));
- if (err)
- return err;
+ if (!access_ok(VERIFY_WRITE, res, sizeof(struct ppp_stats)))
+ return -EFAULT;
/* build a temporary stat struct and copy it to user space */
diff -puN drivers/isdn/icn/icn.c~verify_area-cleanup-drivers-part-1 drivers/isdn/icn/icn.c
--- 25/drivers/isdn/icn/icn.c~verify_area-cleanup-drivers-part-1 2005-03-11 11:46:41.000000000 -0800
+++ 25-akpm/drivers/isdn/icn/icn.c 2005-03-11 11:46:41.000000000 -0800
@@ -908,14 +908,13 @@ icn_loadproto(u_char __user * buffer, ic
uint left = ICN_CODE_STAGE2;
uint cnt;
int timer;
- int ret;
unsigned long flags;
#ifdef BOOT_DEBUG
printk(KERN_DEBUG "icn_loadproto called\n");
#endif
- if ((ret = verify_area(VERIFY_READ, buffer, ICN_CODE_STAGE2)))
- return ret;
+ if (!access_ok(VERIFY_READ, buffer, ICN_CODE_STAGE2))
+ return -EFAULT;
timer = 0;
spin_lock_irqsave(&dev.devlock, flags);
if (card->secondhalf) {
diff -puN drivers/isdn/isdnloop/isdnloop.c~verify_area-cleanup-drivers-part-1 drivers/isdn/isdnloop/isdnloop.c
--- 25/drivers/isdn/isdnloop/isdnloop.c~verify_area-cleanup-drivers-part-1 2005-03-11 11:46:41.000000000 -0800
+++ 25-akpm/drivers/isdn/isdnloop/isdnloop.c 2005-03-11 11:46:41.000000000 -0800
@@ -1146,8 +1146,8 @@ isdnloop_command(isdn_ctrl * c, isdnloop
case ISDNLOOP_IOCTL_DEBUGVAR:
return (ulong) card;
case ISDNLOOP_IOCTL_STARTUP:
- if ((i = verify_area(VERIFY_READ, (void *) a, sizeof(isdnloop_sdef))))
- return i;
+ if (!access_ok(VERIFY_READ, (void *) a, sizeof(isdnloop_sdef)))
+ return -EFAULT;
return (isdnloop_start(card, (isdnloop_sdef *) a));
break;
case ISDNLOOP_IOCTL_ADDCARD:
diff -puN drivers/macintosh/adb.c~verify_area-cleanup-drivers-part-1 drivers/macintosh/adb.c
--- 25/drivers/macintosh/adb.c~verify_area-cleanup-drivers-part-1 2005-03-11 11:46:41.000000000 -0800
+++ 25-akpm/drivers/macintosh/adb.c 2005-03-11 11:46:41.000000000 -0800
@@ -755,7 +755,7 @@ static int adb_release(struct inode *ino
static ssize_t adb_read(struct file *file, char __user *buf,
size_t count, loff_t *ppos)
{
- int ret;
+ int ret = 0;
struct adbdev_state *state = file->private_data;
struct adb_request *req;
wait_queue_t wait = __WAITQUEUE_INITIALIZER(wait,current);
@@ -765,9 +765,8 @@ static ssize_t adb_read(struct file *fil
return -EINVAL;
if (count > sizeof(req->reply))
count = sizeof(req->reply);
- ret = verify_area(VERIFY_WRITE, buf, count);
- if (ret)
- return ret;
+ if (!access_ok(VERIFY_WRITE, buf, count))
+ return -EFAULT;
req = NULL;
spin_lock_irqsave(&state->lock, flags);
@@ -824,9 +823,8 @@ static ssize_t adb_write(struct file *fi
return -EINVAL;
if (adb_controller == NULL)
return -ENXIO;
- ret = verify_area(VERIFY_READ, buf, count);
- if (ret)
- return ret;
+ if (!access_ok(VERIFY_READ, buf, count))
+ return -EFAULT;
req = (struct adb_request *) kmalloc(sizeof(struct adb_request),
GFP_KERNEL);
diff -puN drivers/macintosh/ans-lcd.c~verify_area-cleanup-drivers-part-1 drivers/macintosh/ans-lcd.c
--- 25/drivers/macintosh/ans-lcd.c~verify_area-cleanup-drivers-part-1 2005-03-11 11:46:41.000000000 -0800
+++ 25-akpm/drivers/macintosh/ans-lcd.c 2005-03-11 11:46:41.000000000 -0800
@@ -61,7 +61,7 @@ anslcd_write( struct file * file, const
printk(KERN_DEBUG "LCD: write\n");
#endif
- if ( verify_area(VERIFY_READ, buf, count) )
+ if (!access_ok(VERIFY_READ, buf, count))
return -EFAULT;
for ( i = *ppos; count > 0; ++i, ++p, --count )
{
diff -puN drivers/macintosh/nvram.c~verify_area-cleanup-drivers-part-1 drivers/macintosh/nvram.c
--- 25/drivers/macintosh/nvram.c~verify_area-cleanup-drivers-part-1 2005-03-11 11:46:41.000000000 -0800
+++ 25-akpm/drivers/macintosh/nvram.c 2005-03-11 11:46:41.000000000 -0800
@@ -45,7 +45,7 @@ static ssize_t read_nvram(struct file *f
unsigned int i;
char __user *p = buf;
- if (verify_area(VERIFY_WRITE, buf, count))
+ if (!access_ok(VERIFY_WRITE, buf, count))
return -EFAULT;
if (*ppos >= NVRAM_SIZE)
return 0;
@@ -63,7 +63,7 @@ static ssize_t write_nvram(struct file *
const char __user *p = buf;
char c;
- if (verify_area(VERIFY_READ, buf, count))
+ if (!access_ok(VERIFY_READ, buf, count))
return -EFAULT;
if (*ppos >= NVRAM_SIZE)
return 0;
diff -puN drivers/macintosh/via-pmu.c~verify_area-cleanup-drivers-part-1 drivers/macintosh/via-pmu.c
--- 25/drivers/macintosh/via-pmu.c~verify_area-cleanup-drivers-part-1 2005-03-11 11:46:41.000000000 -0800
+++ 25-akpm/drivers/macintosh/via-pmu.c 2005-03-11 11:46:43.000000000 -0800
@@ -2774,13 +2774,12 @@ pmu_read(struct file *file, char __user
struct pmu_private *pp = file->private_data;
DECLARE_WAITQUEUE(wait, current);
unsigned long flags;
- int ret;
+ int ret = 0;
if (count < 1 || pp == 0)
return -EINVAL;
- ret = verify_area(VERIFY_WRITE, buf, count);
- if (ret)
- return ret;
+ if (!access_ok(VERIFY_WRITE, buf, count))
+ return -EFAULT;
spin_lock_irqsave(&pp->lock, flags);
add_wait_queue(&pp->wait, &wait);
diff -puN drivers/media/video/c-qcam.c~verify_area-cleanup-drivers-part-1 drivers/media/video/c-qcam.c
--- 25/drivers/media/video/c-qcam.c~verify_area-cleanup-drivers-part-1 2005-03-11 11:46:41.000000000 -0800
+++ 25-akpm/drivers/media/video/c-qcam.c 2005-03-11 11:46:41.000000000 -0800
@@ -363,7 +363,7 @@ static long qc_capture(struct qcam_devic
size_t wantlen, outptr = 0;
char tmpbuf[BUFSZ];
- if (verify_area(VERIFY_WRITE, buf, len))
+ if (!access_ok(VERIFY_WRITE, buf, len))
return -EFAULT;
/* Wait for camera to become ready */
_