Commit 4f07bfc5 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Martin K. Petersen
Browse files

scsi: scsi_ioctl: Remove scsi_verify_blk_ioctl() 

Manually verify that the device is not a partition and the caller has admin
privіleges at the beginning of the sr ioctl method and open code the
trivial check for sd as well.

Link: https://lore.kernel.org/r/20210724072033.1284840-11-hch@lst.de


Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent fb1ba406

block/scsi_ioctl.c

+0 −12
Original line number Diff line number Diff line
@@ -842,18 +842,6 @@ int scsi_cmd_ioctl(struct request_queue *q, struct gendisk *bd_disk, fmode_t mod 
}

EXPORT_SYMBOL(scsi_cmd_ioctl);



int scsi_verify_blk_ioctl(struct block_device *bd, unsigned int cmd)

{

	if (bd && !bdev_is_partition(bd))

		return 0;



	if (capable(CAP_SYS_RAWIO))

		return 0;



	return -ENOIOCTLCMD;

}

EXPORT_SYMBOL(scsi_verify_blk_ioctl);



/**

 * scsi_req_init - initialize certain fields of a scsi_request structure

 * @req: Pointer to a scsi_request structure.

drivers/scsi/sd.c

+2 −6
Original line number Diff line number Diff line
@@ -1555,9 +1555,8 @@ static int sd_ioctl(struct block_device *bdev, fmode_t mode, 
	SCSI_LOG_IOCTL(1, sd_printk(KERN_INFO, sdkp, "sd_ioctl: disk=%s, "

				    "cmd=0x%x\n", disk->disk_name, cmd));



	error = scsi_verify_blk_ioctl(bdev, cmd);

	if (error < 0)

		return error;

	if (bdev_is_partition(bdev) && !capable(CAP_SYS_RAWIO))

		return -ENOIOCTLCMD;



	/*

	 * If we are in the middle of error recovery, don't let anyone
@@ -1583,9 +1582,6 @@ static int sd_ioctl(struct block_device *bdev, fmode_t mode, 
	case SCSI_IOCTL_GET_BUS_NUMBER:

		break;

	default:

		error = scsi_verify_blk_ioctl(bdev, cmd);

		if (error < 0)

			return error;

		error = scsi_cmd_ioctl(disk->queue, disk, mode, cmd, p);

		if (error != -ENOTTY)

			return error;

drivers/scsi/sr.c

+3 −3
Original line number Diff line number Diff line
@@ -562,6 +562,9 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd, 
	void __user *argp = (void __user *)arg;

	int ret;



	if (bdev_is_partition(bdev) && !capable(CAP_SYS_RAWIO))

		return -ENOIOCTLCMD;



	mutex_lock(&cd->lock);



	ret = scsi_ioctl_block_when_processing_errors(sdev, cmd,
@@ -580,9 +583,6 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd, 
	case SCSI_IOCTL_GET_BUS_NUMBER:

		break;

	default:

		ret = scsi_verify_blk_ioctl(bdev, cmd);

		if (ret < 0)

			goto put;

		ret = scsi_cmd_ioctl(disk->queue, disk, mode, cmd, argp);

		if (ret != -ENOTTY)

			goto put;

include/linux/blkdev.h

+0 −1
Original line number Diff line number Diff line
@@ -888,7 +888,6 @@ extern blk_status_t blk_insert_cloned_request(struct request_queue *q, 
				     struct request *rq);

int blk_rq_append_bio(struct request *rq, struct bio *bio);

extern void blk_queue_split(struct bio **);

extern int scsi_verify_blk_ioctl(struct block_device *, unsigned int);

extern int scsi_cmd_ioctl(struct request_queue *, struct gendisk *, fmode_t,

			  unsigned int, void __user *);

extern int sg_scsi_ioctl(struct request_queue *, struct gendisk *, fmode_t,