renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-28 07:04:00 +08:00
Code

staging: dgrp: dgrp_tty.c: Audit the return values of get/put_user()

Browse Source 
fix for missing audits for return values of get_user() and put_user().
Inspecting the return values of get/put_user() would make the access_ok()
redundant, hence removing calls to access_ok() in such scenarios.

Signed-off-by: Kumar Amit Mehta <gmate.amit@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kumar Amit Mehta 2012-11-23 01:16:35 +05:30 committed by Greg Kroah-Hartman
parent 3ba89e9661
commit d53c57dca2
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/staging/dgrp/dgrp_tty.c
View File

@ -2265,9 +2265,7 @@ static int get_modem_info(struct ch_struct *ch, unsigned int *value)
| ((mlast & DM_RI) ? TIOCM_RNG : 0)
| ((mlast & DM_DSR) ? TIOCM_DSR : 0)
| ((mlast & DM_CTS) ? TIOCM_CTS : 0);
put_user(mlast, (unsigned int __user *) value);
return 0;
return put_user(mlast, (unsigned int __user *) value);
}
/*
@ -2285,7 +2283,8 @@ static int set_modem_info(struct ch_struct *ch, unsigned int command,
if (error == 0)
return -EFAULT;
get_user(arg, (unsigned int __user *) value);
if (get_user(arg, (unsigned int __user *) value))
return -EFAULT;
mval |= ((arg & TIOCM_RTS) ? DM_RTS : 0)
| ((arg & TIOCM_DTR) ? DM_DTR : 0);
@ -2616,12 +2615,8 @@ static int dgrp_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
return 0;
case TIOCGSOFTCAR:
rc = access_ok(VERIFY_WRITE, (void __user *) arg,
sizeof(long));
if (rc == 0)
return -EFAULT;
put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned long __user *) arg);
return 0;
return put_user(C_CLOCAL(tty) ? 1 : 0,
(unsigned long __user *) arg);
case TIOCMGET:
rc = access_ok(VERIFY_WRITE, (void __user *) arg,
@ -2844,17 +2839,16 @@ static int dgrp_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
break;
case DIGI_GETCUSTOMBAUD:
rc = access_ok(VERIFY_WRITE, (void __user *) arg, sizeof(int));
if (rc == 0)
if (put_user(ch->ch_custom_speed, (unsigned int __user *) arg))
return -EFAULT;
put_user(ch->ch_custom_speed, (unsigned int __user *) arg);
break;
case DIGI_SETCUSTOMBAUD:
{
int new_rate;
get_user(new_rate, (unsigned int __user *) arg);
if (get_user(new_rate, (unsigned int __user *) arg))
return -EFAULT;
dgrp_set_custom_speed(ch, new_rate);
break;