@@ -838,6 +838,8 @@ static void __blk_release_queue(struct work_struct *work)
blk_exit_rl(q, &q->root_rl);
+ kfree(q->cmd_filter);
+
if (q->queue_tags)
__blk_queue_free_tags(q);
@@ -41,8 +41,8 @@ static int bsg_transport_check_proto(struct sg_io_v4 *hdr)
return 0;
}
-static int bsg_transport_fill_hdr(struct request *rq, struct sg_io_v4 *hdr,
- fmode_t mode)
+static int bsg_transport_fill_hdr(struct request_queue *q, struct request *rq,
+ struct sg_io_v4 *hdr, fmode_t mode)
{
struct bsg_job *job = blk_mq_rq_to_pdu(rq);
@@ -69,8 +69,8 @@ static int bsg_scsi_check_proto(struct sg_io_v4 *hdr)
return 0;
}
-static int bsg_scsi_fill_hdr(struct request *rq, struct sg_io_v4 *hdr,
- fmode_t mode)
+static int bsg_scsi_fill_hdr(struct request_queue *q, struct request *rq,
+ struct sg_io_v4 *hdr, fmode_t mode)
{
struct scsi_request *sreq = scsi_req(rq);
@@ -83,7 +83,7 @@ static int bsg_scsi_fill_hdr(struct request *rq, struct sg_io_v4 *hdr,
if (copy_from_user(sreq->cmd, uptr64(hdr->request), sreq->cmd_len))
return -EFAULT;
- if (blk_verify_command(sreq->cmd, mode))
+ if (blk_verify_command(q, sreq->cmd, mode))
return -EPERM;
return 0;
}
@@ -159,7 +159,7 @@ static void bsg_scsi_free_rq(struct request *rq)
if (IS_ERR(rq))
return rq;
- ret = q->bsg_dev.ops->fill_hdr(rq, hdr, mode);
+ ret = q->bsg_dev.ops->fill_hdr(q, rq, hdr, mode);
if (ret)
goto out;
@@ -34,11 +34,6 @@
#include <scsi/scsi_ioctl.h>
#include <scsi/scsi_cmnd.h>
-struct blk_cmd_filter {
- unsigned long read_ok[BLK_SCSI_CMD_PER_LONG];
- unsigned long write_ok[BLK_SCSI_CMD_PER_LONG];
-};
-
static struct blk_cmd_filter blk_default_cmd_filter;
/* Command group 3 is reserved and should never be used. */
@@ -207,14 +202,18 @@ static void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter)
__set_bit(GPCMD_SET_READ_AHEAD, filter->write_ok);
}
-int blk_verify_command(unsigned char *cmd, fmode_t mode)
+int blk_verify_command(struct request_queue *q, unsigned char *cmd,
+ fmode_t mode)
{
- struct blk_cmd_filter *filter = &blk_default_cmd_filter;
-
+ struct blk_cmd_filter *filter = q->cmd_filter;
+
/* root can do any command. */
if (capable(CAP_SYS_RAWIO))
return 0;
+ if (!filter)
+ filter = &blk_default_cmd_filter;
+
/* Anybody who can open the device can do a read-safe command */
if (test_bit(cmd[0], filter->read_ok))
return 0;
@@ -234,7 +233,7 @@ static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
if (copy_from_user(req->cmd, hdr->cmdp, hdr->cmd_len))
return -EFAULT;
- if (blk_verify_command(req->cmd, mode))
+ if (blk_verify_command(q, req->cmd, mode))
return -EPERM;
/*
@@ -468,7 +467,7 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
goto error;
- err = blk_verify_command(req->cmd, mode);
+ err = blk_verify_command(q, req->cmd, mode);
if (err)
goto error;
@@ -240,11 +240,12 @@ static int sg_check_file_access(struct file *filp, const char *caller)
static int sg_allow_access(struct file *filp, unsigned char *cmd)
{
struct sg_fd *sfp = filp->private_data;
+ struct scsi_device *device = sfp->parentdp->device;
- if (sfp->parentdp->device->type == TYPE_SCANNER)
+ if (device->type == TYPE_SCANNER)
return 0;
- return blk_verify_command(cmd, filp->f_mode);
+ return blk_verify_command(device->request_queue, cmd, filp->f_mode);
}
static int
@@ -352,6 +352,11 @@ struct blk_queue_tag {
#define BLK_SCSI_MAX_CMDS (256)
#define BLK_SCSI_CMD_PER_LONG (BLK_SCSI_MAX_CMDS / (sizeof(long) * 8))
+struct blk_cmd_filter {
+ unsigned long read_ok[BLK_SCSI_CMD_PER_LONG];
+ unsigned long write_ok[BLK_SCSI_CMD_PER_LONG];
+};
+
/*
* Zoned block device models (zoned limit).
*/
@@ -639,6 +644,7 @@ struct request_queue {
bsg_job_fn *bsg_job_fn;
struct bsg_class_device bsg_dev;
#endif
+ struct blk_cmd_filter *cmd_filter;
#ifdef CONFIG_BLK_DEV_THROTTLING
/* Throttle data */
@@ -1424,7 +1430,8 @@ static inline int sb_issue_zeroout(struct super_block *sb, sector_t block,
gfp_mask, 0);
}
-extern int blk_verify_command(unsigned char *cmd, fmode_t mode);
+extern int blk_verify_command(struct request_queue *q, unsigned char *cmd,
+ fmode_t mode);
enum blk_default_limits {
BLK_MAX_SEGMENTS = 128,
@@ -9,8 +9,8 @@
#ifdef CONFIG_BLK_DEV_BSG
struct bsg_ops {
int (*check_proto)(struct sg_io_v4 *hdr);
- int (*fill_hdr)(struct request *rq, struct sg_io_v4 *hdr,
- fmode_t mode);
+ int (*fill_hdr)(struct request_queue *q, struct request *rq,
+ struct sg_io_v4 *hdr, fmode_t mode);
int (*complete_rq)(struct request *rq, struct sg_io_v4 *hdr);
void (*free_rq)(struct request *rq);
};
The command filter used to be mutable via sysfs, but this was broken and backed out. Let's add it back. This patch adds the infrastructure for filtering, but unlike the old code this one just adds a pointer to request_queue, so as to make it cheaper in the majority of cases where no special filtering is desired. This is a revert of commit 018e044 ("block: get rid of queue-private command filter", 2009-06-26), though with many changes. Cc: linux-scsi@vger.kernel.org Cc: Hannes Reinecke <hare@suse.com> Cc: Martin K. Petersen <martin.petersen@oracle.com> Cc: James Bottomley <James.Bottomley@hansenpartnership.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- block/blk-sysfs.c | 2 ++ block/bsg-lib.c | 4 ++-- block/bsg.c | 8 ++++---- block/scsi_ioctl.c | 19 +++++++++---------- drivers/scsi/sg.c | 5 +++-- include/linux/blkdev.h | 9 ++++++++- include/linux/bsg.h | 4 ++-- 7 files changed, 30 insertions(+), 21 deletions(-)