| Message ID | 20170531214350.31157-6-bart.vanassche@sandisk.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 05/31/2017 11:43 PM, Bart Van Assche wrote: > The CDROMREADAUDIO ioctl uses SCSI passthrough when the .disk > pointer has been set in struct cdrom_device_info. Hence check > whether SCSI passthrough is supported before submitting a SCSI > command. Note: both the ide-cd and sr drivers set the disk > pointer in struct cdrom_device_info but neither the pcd nor > the gdrom driver sets that pointer. > > References: commit 82ed4db499b8 ("block: split scsi_request out of struct request") > Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com> > Cc: Christoph Hellwig <hch@lst.de> > Cc: Hannes Reinecke <hare@suse.com> > Cc: Omar Sandoval <osandov@fb.com> > Cc: linux-block@vger.kernel.org > --- > drivers/cdrom/cdrom.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c > index 76c952fd9ab9..ff19cfc587f0 100644 > --- a/drivers/cdrom/cdrom.c > +++ b/drivers/cdrom/cdrom.c > @@ -2178,6 +2178,12 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf, > if (!q) > return -ENXIO; > > + if (!blk_queue_scsi_passthrough(q)) { > + WARN_ONCE(true, > + "Attempt read CDDA info through a non-SCSI queue\n"); > + return -EINVAL; > + } > + > cdi->last_sense = 0; > > while (nframes) { > Reviewed-by: Hannes Reinecke <hare@suse.com> Cheers, Hannes
On Wed, May 31, 2017 at 02:43:49PM -0700, Bart Van Assche wrote: > The CDROMREADAUDIO ioctl uses SCSI passthrough when the .disk > pointer has been set in struct cdrom_device_info. Hence check > whether SCSI passthrough is supported before submitting a SCSI > command. Note: both the ide-cd and sr drivers set the disk > pointer in struct cdrom_device_info but neither the pcd nor > the gdrom driver sets that pointer. And I think that's exactly the point. There probably can be some further cleanup in this area, but for now this looks good: Reviewed-by: Christoph Hellwig <hch@lst.de>
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c index 76c952fd9ab9..ff19cfc587f0 100644 --- a/drivers/cdrom/cdrom.c +++ b/drivers/cdrom/cdrom.c @@ -2178,6 +2178,12 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf, if (!q) return -ENXIO; + if (!blk_queue_scsi_passthrough(q)) { + WARN_ONCE(true, + "Attempt read CDDA info through a non-SCSI queue\n"); + return -EINVAL; + } + cdi->last_sense = 0; while (nframes) {
The CDROMREADAUDIO ioctl uses SCSI passthrough when the .disk pointer has been set in struct cdrom_device_info. Hence check whether SCSI passthrough is supported before submitting a SCSI command. Note: both the ide-cd and sr drivers set the disk pointer in struct cdrom_device_info but neither the pcd nor the gdrom driver sets that pointer. References: commit 82ed4db499b8 ("block: split scsi_request out of struct request") Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Hannes Reinecke <hare@suse.com> Cc: Omar Sandoval <osandov@fb.com> Cc: linux-block@vger.kernel.org --- drivers/cdrom/cdrom.c | 6 ++++++ 1 file changed, 6 insertions(+)