diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/block/scsi_ioctl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/scsi_ioctl.c b/drivers/block/scsi_ioctl.c index 079ec344eb47..382dea7b224c 100644 --- a/drivers/block/scsi_ioctl.c +++ b/drivers/block/scsi_ioctl.c | |||
@@ -201,15 +201,15 @@ static int verify_command(struct file *file, unsigned char *cmd) | |||
201 | return 0; | 201 | return 0; |
202 | } | 202 | } |
203 | 203 | ||
204 | /* And root can do any command.. */ | ||
205 | if (capable(CAP_SYS_RAWIO)) | ||
206 | return 0; | ||
207 | |||
204 | if (!type) { | 208 | if (!type) { |
205 | cmd_type[cmd[0]] = CMD_WARNED; | 209 | cmd_type[cmd[0]] = CMD_WARNED; |
206 | printk(KERN_WARNING "scsi: unknown opcode 0x%02x\n", cmd[0]); | 210 | printk(KERN_WARNING "scsi: unknown opcode 0x%02x\n", cmd[0]); |
207 | } | 211 | } |
208 | 212 | ||
209 | /* And root can do any command.. */ | ||
210 | if (capable(CAP_SYS_RAWIO)) | ||
211 | return 0; | ||
212 | |||
213 | /* Otherwise fail it with an "Operation not permitted" */ | 213 | /* Otherwise fail it with an "Operation not permitted" */ |
214 | return -EPERM; | 214 | return -EPERM; |
215 | } | 215 | } |