lkml.org 
[lkml]   [2014]   [May]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: block: remove dead code in scsi_ioctl:blk_verify_command
On 05/29/2014 01:11 PM, Dave Jones wrote:
> filter gets assigned the address of blk_default_cmd_filter on
> entry to this function, so the !filter condition can never be true.
>
> Signed-off-by: Dave Jones <davej@redhat.com>
>
> diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
> index 26487972ac54..9c28a5b38042 100644
> --- a/block/scsi_ioctl.c
> +++ b/block/scsi_ioctl.c
> @@ -205,10 +205,6 @@ int blk_verify_command(unsigned char *cmd, fmode_t has_write_perm)
> if (capable(CAP_SYS_RAWIO))
> return 0;
>
> - /* if there's no filter set, assume we're filtering everything out */
> - if (!filter)
> - return -EPERM;
> -
> /* Anybody who can open the device can do a read-safe command */
> if (test_bit(cmd[0], filter->read_ok))
> return 0;

Thanks Dave, applied.

--
Jens Axboe



\
 
 \ /
  Last update: 2014-05-29 22:21    [W:0.043 / U:0.096 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site