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: Christoph Hellwig <hch@lst.de>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 86619472d916..113fc6edb2b0 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -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))