Commit fde6d638 authored by Maximilian Attems's avatar Maximilian Attems Committed by Linus Torvalds

[PATCH] remove last suser() call from drivers/char/rocket.c

Signed-off-by: default avatarMaximilian Attems <janitor@sternwelten.at>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7c830b4a
...@@ -1283,11 +1283,7 @@ static int set_config(struct r_port *info, struct rocket_config __user *new_info ...@@ -1283,11 +1283,7 @@ static int set_config(struct r_port *info, struct rocket_config __user *new_info
if (copy_from_user(&new_serial, new_info, sizeof (new_serial))) if (copy_from_user(&new_serial, new_info, sizeof (new_serial)))
return -EFAULT; return -EFAULT;
#ifdef CAP_SYS_ADMIN
if (!capable(CAP_SYS_ADMIN)) if (!capable(CAP_SYS_ADMIN))
#else
if (!suser())
#endif
{ {
if ((new_serial.flags & ~ROCKET_USR_MASK) != (info->flags & ~ROCKET_USR_MASK)) if ((new_serial.flags & ~ROCKET_USR_MASK) != (info->flags & ~ROCKET_USR_MASK))
return -EPERM; return -EPERM;
......
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