Commit e6a5383f authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds

[PATCH] janitor: isdn: remove unneeded verify_area calls

From: Domen Puncer <domen@coderock.org>

Deleted unneeded verify_area calls.
Also commented a label.
parent fd74e378
...@@ -1631,11 +1631,6 @@ isdn_ctrl_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg) ...@@ -1631,11 +1631,6 @@ isdn_ctrl_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
char *p = (char *) arg; char *p = (char *) arg;
int i; int i;
if ((ret = verify_area(VERIFY_WRITE, (void *) arg,
(ISDN_MODEM_NUMREG + ISDN_MSNLEN + ISDN_LMSNLEN)
* ISDN_MAX_CHANNELS)))
return ret;
for (i = 0; i < ISDN_MAX_CHANNELS; i++) { for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
if (copy_to_user(p, isdn_mdm.info[i].emu.profile, if (copy_to_user(p, isdn_mdm.info[i].emu.profile,
ISDN_MODEM_NUMREG)) ISDN_MODEM_NUMREG))
...@@ -1658,11 +1653,6 @@ isdn_ctrl_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg) ...@@ -1658,11 +1653,6 @@ isdn_ctrl_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
char *p = (char *) arg; char *p = (char *) arg;
int i; int i;
if ((ret = verify_area(VERIFY_READ, (void *) arg,
(ISDN_MODEM_NUMREG + ISDN_MSNLEN + ISDN_LMSNLEN)
* ISDN_MAX_CHANNELS)))
return ret;
for (i = 0; i < ISDN_MAX_CHANNELS; i++) { for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
if (copy_from_user(isdn_mdm.info[i].emu.profile, p, if (copy_from_user(isdn_mdm.info[i].emu.profile, p,
ISDN_MODEM_NUMREG)) ISDN_MODEM_NUMREG))
...@@ -1700,9 +1690,8 @@ isdn_ctrl_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg) ...@@ -1700,9 +1690,8 @@ isdn_ctrl_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
int j = 0; int j = 0;
while (1) { while (1) {
if ((ret = verify_area(VERIFY_READ, p, 1))) if ((ret = get_user(bname[j], p++)))
return ret; return ret;
get_user(bname[j], p++);
switch (bname[j]) { switch (bname[j]) {
case '\0': case '\0':
loop = 0; loop = 0;
...@@ -2240,7 +2229,7 @@ static int __init isdn_init(void) ...@@ -2240,7 +2229,7 @@ static int __init isdn_init(void)
isdn_info_update(); isdn_info_update();
return 0; return 0;
err_tty_modem: /* err_tty_modem:*/
isdn_tty_exit(); isdn_tty_exit();
err_cleanup_devfs: err_cleanup_devfs:
isdn_cleanup_devfs(); isdn_cleanup_devfs();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment