Skip to content

Commit

Permalink
[BLOCK] scsi_ioctl: file can be NULL from ioctl_by_bdev()
Browse files Browse the repository at this point in the history
Signed-off-by: Jens Axboe <axboe@suse.de>
  • Loading branch information
Jens Axboe committed Jan 9, 2006
1 parent 0ea60b5 commit 5a57be8
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions block/scsi_ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -190,16 +190,21 @@ static int verify_command(struct file *file, unsigned char *cmd)
safe_for_write(GPCMD_SET_STREAMING),
};
unsigned char type = cmd_type[cmd[0]];
int has_write_perm = 0;

/* Anybody who can open the device can do a read-safe command */
if (type & CMD_READ_SAFE)
return 0;

/*
* file can be NULL from ioctl_by_bdev()...
*/
if (file)
has_write_perm = file->f_mode & FMODE_WRITE;

/* Write-safe commands just require a writable open.. */
if (type & CMD_WRITE_SAFE) {
if (file->f_mode & FMODE_WRITE)
return 0;
}
if ((type & CMD_WRITE_SAFE) && has_write_perm)
return 0;

/* And root can do any command.. */
if (capable(CAP_SYS_RAWIO))
Expand Down

0 comments on commit 5a57be8

Please sign in to comment.