From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mike Christie <michaelc@cs.wisc.edu>
Subject: Re: [PATCH] qla4xx: a small loop fix
Date: Tue, 01 Nov 2011 13:10:50 -0500
Message-ID: <4EB0362A.3050408@cs.wisc.edu>
References: <4EB02263.1080603@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Return-path: <linux-scsi-owner@vger.kernel.org>
Received: from sabe.cs.wisc.edu ([128.105.6.20]:52554 "EHLO sabe.cs.wisc.edu"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754351Ab1KASFK (ORCPT <rfc822;linux-scsi@vger.kernel.org>);
	Tue, 1 Nov 2011 14:05:10 -0400
In-Reply-To: <4EB02263.1080603@redhat.com>
Sender: linux-scsi-owner@vger.kernel.org
List-Id: linux-scsi@vger.kernel.org
To: Tomas Henzl <thenzl@redhat.com>
Cc: "'linux-scsi@vger.kernel.org'" <linux-scsi@vger.kernel.org>, vikas.chaudhary@qlogic.com, lalit.chandivade@qlogic.com, ravi.anand@qlogic.com

On 11/01/2011 11:46 AM, Tomas Henzl wrote:
> From: Tomas Henzl <thenzl@redhat.com>
> 
> When the qla4xxx_get_fwddb_entry returns QLA_ERROR
> the nex_idx is not updated, 
>       for (idx = 0; idx < max_ddbs; idx = next_idx) {
>                 ret = qla4xxx_get_fwddb_entry(ha, idx, NULL, 0, NULL,
>                                               &next_idx, &state, &conn_err,
>                                                 NULL, NULL);
>                 if (ret == QLA_ERROR)
>                         continue;
>  
> This means there is a risk that the 'idx < max_ddbs' condition will never
> met and the loop will loop forever.
> Fix this by explicitly increasing the next_idx in the error condition.
> 
> Maybe a break instead of continue is more appropriate, leaving the decision
> on the qlogic maintainer.
> 
> Signed-off-by: Tomas Henzl <thenzl@redhat.com>
> 
> diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c
> index 3075fba..17acb17 100644
> --- a/drivers/scsi/qla4xxx/ql4_init.c
> +++ b/drivers/scsi/qla4xxx/ql4_init.c
> @@ -787,8 +787,10 @@ static void qla4xxx_free_ddb_index(struct scsi_qla_host *ha)
>  		ret = qla4xxx_get_fwddb_entry(ha, idx, NULL, 0, NULL,
>  					      &next_idx, &state, &conn_err,
>  						NULL, NULL);
> -		if (ret == QLA_ERROR)
> +		if (ret == QLA_ERROR) {
> +			next_idx++;
>  			continue;
> +		}
>  		if (state == DDB_DS_NO_CONNECTION_ACTIVE ||
>  		    state == DDB_DS_SESSION_FAILED) {
>  			DEBUG2(ql4_printk(KERN_INFO, ha,

Patch looks correct.

James, this is a patch for something that is not yet upstream. I will
just merge this patch with the patch I was going to send upstream, so do
not worry about it.