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

Commit 4e178c17 authored by Kees Cook's avatar Kees Cook Committed by Jens Axboe
Browse files

cdrom: Use struct scsi_sense_hdr internally 



This removes more casts of struct request_sense and uses the standard
struct scsi_sense_hdr instead. This also fixes any possible stale values
since the prior code did not check the sense length.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 7a6873be

drivers/block/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -74,12 +74,12 @@ config AMIGA_Z2RAM 


config CDROM

	tristate

	select BLK_SCSI_REQUEST



config GDROM

	tristate "SEGA Dreamcast GD-ROM drive"

	depends on SH_DREAMCAST

	select CDROM

	select BLK_SCSI_REQUEST # only for the generic cdrom code

	help

	  A standard SEGA Dreamcast comes with a modified CD ROM drive called a

	  "GD-ROM" by SEGA to signify it is capable of reading special disks

drivers/cdrom/cdrom.c

+6 −2
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ 
#include <linux/blkdev.h>

#include <linux/times.h>

#include <linux/uaccess.h>

#include <scsi/scsi_common.h>

#include <scsi/scsi_request.h>



/* used to tell the module to turn on full debugging messages */
@@ -2222,9 +2223,12 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf, 


		blk_execute_rq(q, cdi->disk, rq, 0);

		if (scsi_req(rq)->result) {

			struct request_sense *s = req->sense;

			struct scsi_sense_hdr sshdr;



			ret = -EIO;

			cdi->last_sense = s->sense_key;

			scsi_normalize_sense(req->sense, req->sense_len,

					     &sshdr);

			cdi->last_sense = sshdr.sense_key;

		}



		if (blk_rq_unmap_user(bio))