diff options
| -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 079ec344eb4..382dea7b224 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)  			return 0;  	} +	/* And root can do any command.. */ +	if (capable(CAP_SYS_RAWIO)) +		return 0; +  	if (!type) {  		cmd_type[cmd[0]] = CMD_WARNED;  		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" */  	return -EPERM;  }  |