Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73d17701 authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

cdrom: Check SCSI passthrough support before reading audio 



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 82ed4db4 ("block: split scsi_request out of struct request")
Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Omar Sandoval <osandov@fb.com>
Cc: linux-block@vger.kernel.org
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent ec2be6a9

drivers/cdrom/cdrom.c

+6 −0
Original line number Diff line number Diff line
@@ -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) {