Просмотр исходного кода

[SCSI] mpt2sas: fix infinite loop inside config request

This restriction is introduced just to avoid loop of
config_request. Retry must be limited so we have restricted
config request to maximum 2 times.

Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Kashyap, Desai 15 лет назад
Родитель
Сommit
6bd4e1e4d6
1 измененных файлов с 6 добавлено и 0 удалено
  1. 6 0
      drivers/scsi/mpt2sas/mpt2sas_config.c

+ 6 - 0
drivers/scsi/mpt2sas/mpt2sas_config.c

@@ -247,6 +247,12 @@ _config_request(struct MPT2SAS_ADAPTER *ioc, Mpi2ConfigRequest_t
 	retry_count = 0;
 	retry_count = 0;
 
 
  retry_config:
  retry_config:
+	if (retry_count) {
+		if (retry_count > 2) /* attempt only 2 retries */
+			return -EFAULT;
+		printk(MPT2SAS_INFO_FMT "%s: attempting retry (%d)\n",
+		    ioc->name, __func__, retry_count);
+	}
 	wait_state_count = 0;
 	wait_state_count = 0;
 	ioc_state = mpt2sas_base_get_iocstate(ioc, 1);
 	ioc_state = mpt2sas_base_get_iocstate(ioc, 1);
 	while (ioc_state != MPI2_IOC_STATE_OPERATIONAL) {
 	while (ioc_state != MPI2_IOC_STATE_OPERATIONAL) {