[PATCH -next] [SCSI] lpfc 8.3.36: fix potential NULL pointer dereference in lpfc_sli4_rq_put()

[PATCH -next] [SCSI] lpfc 8.3.36: fix potential NULL pointer dereference in lpfc_sli4_rq_put()

[Wei Yongjun]

From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

The dereference to 'put_index' should be moved below the NULL test.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
 drivers/scsi/lpfc/lpfc_sli.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 624eab3..a9a7fd7 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -431,11 +431,12 @@ lpfc_sli4_rq_put(struct lpfc_queue *hq, struct lpfc_queue *dq,
 	struct lpfc_rqe *temp_hrqe;
 	struct lpfc_rqe *temp_drqe;
 	struct lpfc_register doorbell;
-	int put_index = hq->host_index;
+	int put_index;
 
 	/* sanity check on queue memory */
 	if (unlikely(!hq) || unlikely(!dq))
 		return -ENOMEM;
+	put_index = hq->host_index;
 	temp_hrqe = hq->qe[hq->host_index].rqe;
 	temp_drqe = dq->qe[dq->host_index].rqe;
 

Re: [PATCH -next] [SCSI] lpfc 8.3.36: fix potential NULL pointer dereference in lpfc_sli4_rq_put()

[James Smart]

Acked-By:   James Smart  <james.smart@emulex.com>

Thanks

-- james s


On 12/2/2012 8:33 AM, Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> The dereference to 'put_index' should be moved below the NULL test.
>
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> ---
>   drivers/scsi/lpfc/lpfc_sli.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
> index 624eab3..a9a7fd7 100644
> --- a/drivers/scsi/lpfc/lpfc_sli.c
> +++ b/drivers/scsi/lpfc/lpfc_sli.c
> @@ -431,11 +431,12 @@ lpfc_sli4_rq_put(struct lpfc_queue *hq, struct lpfc_queue *dq,
>   	struct lpfc_rqe *temp_hrqe;
>   	struct lpfc_rqe *temp_drqe;
>   	struct lpfc_register doorbell;
> -	int put_index = hq->host_index;
> +	int put_index;
>   
>   	/* sanity check on queue memory */
>   	if (unlikely(!hq) || unlikely(!dq))
>   		return -ENOMEM;
> +	put_index = hq->host_index;
>   	temp_hrqe = hq->qe[hq->host_index].rqe;
>   	temp_drqe = dq->qe[dq->host_index].rqe;
>   
>
>
>
>

Re: [PATCH -next] [SCSI] lpfc 8.3.36: fix potential NULL pointer dereference in lpfc_sli4_rq_put()

[James Smart]

James,

Can you please merge this fix into scsi git for merging into 3.9 ?

-- james s



On 12/6/2012 10:46 AM, James Smart wrote:
> Acked-By: James Smart  <james.smart@emulex.com>
>
> Thanks
>
> -- james s
>
>
> On 12/2/2012 8:33 AM, Wei Yongjun wrote:
>> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>>
>> The dereference to 'put_index' should be moved below the NULL test.
>>
>> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>> ---
>>   drivers/scsi/lpfc/lpfc_sli.c | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
>> index 624eab3..a9a7fd7 100644
>> --- a/drivers/scsi/lpfc/lpfc_sli.c
>> +++ b/drivers/scsi/lpfc/lpfc_sli.c
>> @@ -431,11 +431,12 @@ lpfc_sli4_rq_put(struct lpfc_queue *hq, struct 
>> lpfc_queue *dq,
>>       struct lpfc_rqe *temp_hrqe;
>>       struct lpfc_rqe *temp_drqe;
>>       struct lpfc_register doorbell;
>> -    int put_index = hq->host_index;
>> +    int put_index;
>>         /* sanity check on queue memory */
>>       if (unlikely(!hq) || unlikely(!dq))
>>           return -ENOMEM;
>> +    put_index = hq->host_index;
>>       temp_hrqe = hq->qe[hq->host_index].rqe;
>>       temp_drqe = dq->qe[dq->host_index].rqe;
>>
>>
>>
>>
>
> -- 
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
>