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

Commit 7a6873be authored by Kees Cook's avatar Kees Cook Committed by Jens Axboe
Browse files

ide-cd: Remove redundant sense buffer 



This is already able to process the sense buffer, so remove the redundant
parsing during the failure path. This also fixes any possible stale values
since the prior code did not check the sense length.

Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
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 e7d0748d

drivers/ide/ide-cd.c

+9 −8
Original line number Diff line number Diff line
@@ -423,6 +423,7 @@ int ide_cd_queue_pc(ide_drive_t *drive, const unsigned char *cmd, 
		    req_flags_t rq_flags)

{

	struct cdrom_info *info = drive->driver_data;

	struct scsi_sense_hdr local_sshdr;

	int retries = 10;

	bool failed;
@@ -430,6 +431,9 @@ int ide_cd_queue_pc(ide_drive_t *drive, const unsigned char *cmd, 
				  "rq_flags: 0x%x",

				  cmd[0], write, timeout, rq_flags);



	if (!sshdr)

		sshdr = &local_sshdr;



	/* start of retry loop */

	do {

		struct request *rq;
@@ -456,7 +460,6 @@ int ide_cd_queue_pc(ide_drive_t *drive, const unsigned char *cmd, 


		if (buffer)

			*bufflen = scsi_req(rq)->resid_len;

		if (sshdr)

		scsi_normalize_sense(scsi_req(rq)->sense,

				     scsi_req(rq)->sense_len, sshdr);
@@ -470,12 +473,10 @@ int ide_cd_queue_pc(ide_drive_t *drive, const unsigned char *cmd, 
			 * The request failed.  Retry if it was due to a unit

			 * attention status (usually means media was changed).

			 */

			struct request_sense *reqbuf = scsi_req(rq)->sense;



			if (reqbuf->sense_key == UNIT_ATTENTION)

			if (sshdr->sense_key == UNIT_ATTENTION)

				cdrom_saw_media_change(drive);

			else if (reqbuf->sense_key == NOT_READY &&

				 reqbuf->asc == 4 && reqbuf->ascq != 4) {

			else if (sshdr->sense_key == NOT_READY &&

				 sshdr->asc == 4 && sshdr->ascq != 4) {

				/*

				 * The drive is in the process of loading

				 * a disk.  Retry, but wait a little to give