Commit 3b0e77bd authored by Jens Axboe's avatar Jens Axboe Committed by Linus Torvalds

[PATCH] scsi_ioctl: only warn for rejected commands

We should not be warning about commands that we allow, even if they are
unknown. So move the if-root-allow check up a notch.
Signed-off-by: default avatarJens Axboe <axboe@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8aa19ad8
...@@ -201,15 +201,15 @@ static int verify_command(struct file *file, unsigned char *cmd) ...@@ -201,15 +201,15 @@ static int verify_command(struct file *file, unsigned char *cmd)
return 0; return 0;
} }
/* And root can do any command.. */
if (capable(CAP_SYS_RAWIO))
return 0;
if (!type) { if (!type) {
cmd_type[cmd[0]] = CMD_WARNED; cmd_type[cmd[0]] = CMD_WARNED;
printk(KERN_WARNING "scsi: unknown opcode 0x%02x\n", cmd[0]); printk(KERN_WARNING "scsi: unknown opcode 0x%02x\n", cmd[0]);
} }
/* And root can do any command.. */
if (capable(CAP_SYS_RAWIO))
return 0;
/* Otherwise fail it with an "Operation not permitted" */ /* Otherwise fail it with an "Operation not permitted" */
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