Unverified Commit 15c3dc2c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7155 [sync] PR-7148: scsi: sd: Fix sd_do_mode_sense() buffer length handling 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/7148 
 
PR sync from: Li Nan <linan122@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/HTW7AWCMTBE5J2DJVIOZASZFJ7JQDMTM/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9FNFK 
 
Link:https://gitee.com/openeuler/kernel/pulls/7155

 

Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents ca1af8a3 cb920450

drivers/scsi/sd.c

+7 −0
Original line number Diff line number Diff line
@@ -2652,6 +2652,13 @@ sd_do_mode_sense(struct scsi_disk *sdkp, int dbd, int modepage, 
		 unsigned char *buffer, int len, struct scsi_mode_data *data,

		 struct scsi_sense_hdr *sshdr)

{

	/*

	 * If we must use MODE SENSE(10), make sure that the buffer length

	 * is at least 8 bytes so that the mode sense header fits.

	 */

	if (sdkp->device->use_10_for_ms && len < 8)

		len = 8;



	return scsi_mode_sense(sdkp->device, dbd, modepage, buffer, len,

			       SD_TIMEOUT, sdkp->max_retries, data,

			       sshdr);