Unverified Commit 272aabf7 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7102 [sync] PR-7039: USB: usb-storage: Prevent divide-by-0 error in isd200_ata_command 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/7039 
 
PR sync from: Jialin Zhang <zhangjialin11@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/J4DT3LYYIW7RBICSLYW6LFPFFS5ZCAZG/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9L9IM 
 
Link:https://gitee.com/openeuler/kernel/pulls/7102

 

Reviewed-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Reviewed-by: default avatarWang ShaoBo <bobo.shaobowang@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 83226bd6 54511770

drivers/usb/storage/isd200.c

+18 −5
Original line number Diff line number Diff line
@@ -1105,7 +1105,7 @@ static void isd200_dump_driveid(struct us_data *us, u16 *id) 
static int isd200_get_inquiry_data( struct us_data *us )

{

	struct isd200_info *info = (struct isd200_info *)us->extra;

	int retStatus = ISD200_GOOD;

	int retStatus;

	u16 *id = info->id;



	usb_stor_dbg(us, "Entering isd200_get_inquiry_data\n");
@@ -1137,6 +1137,13 @@ static int isd200_get_inquiry_data( struct us_data *us ) 
				isd200_fix_driveid(id);

				isd200_dump_driveid(us, id);



				/* Prevent division by 0 in isd200_scsi_to_ata() */

				if (id[ATA_ID_HEADS] == 0 || id[ATA_ID_SECTORS] == 0) {

					usb_stor_dbg(us, "   Invalid ATA Identify data\n");

					retStatus = ISD200_ERROR;

					goto Done;

				}



				memset(&info->InquiryData, 0, sizeof(info->InquiryData));



				/* Standard IDE interface only supports disks */
@@ -1202,6 +1209,7 @@ static int isd200_get_inquiry_data( struct us_data *us ) 
		}

	}



 Done:

	usb_stor_dbg(us, "Leaving isd200_get_inquiry_data %08X\n", retStatus);



	return(retStatus);
@@ -1481,22 +1489,27 @@ static int isd200_init_info(struct us_data *us) 


static int isd200_Initialization(struct us_data *us)

{

	int rc = 0;



	usb_stor_dbg(us, "ISD200 Initialization...\n");



	/* Initialize ISD200 info struct */



	if (isd200_init_info(us) == ISD200_ERROR) {

	if (isd200_init_info(us) < 0) {

		usb_stor_dbg(us, "ERROR Initializing ISD200 Info struct\n");

		rc = -ENOMEM;

	} else {

		/* Get device specific data */



		if (isd200_get_inquiry_data(us) != ISD200_GOOD)

		if (isd200_get_inquiry_data(us) != ISD200_GOOD) {

			usb_stor_dbg(us, "ISD200 Initialization Failure\n");

		else

			rc = -EINVAL;

		} else {

			usb_stor_dbg(us, "ISD200 Initialization complete\n");

		}

	}



	return 0;

	return rc;

}