[PATCH] qla2xxx: Fix Null ptr dereference in fail path in queue create code

[PATCH] qla2xxx: Fix Null ptr dereference in fail path in queue create code

[Anirban Chakraborty]

Current code jumps to fail path in queue create functions and there it invokes 
the queue free call with a (NULL) pointer to the queue which could not be 
allocated. Fix it by returning ENOMEM directly without invoking the queue free 
call.

Signed-off-by Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
---
 drivers/scsi/qla2xxx/qla_mid.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c
index 42b799a..a588152 100644
--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -568,7 +568,7 @@ qla25xx_create_req_que(struct qla_hw_data *ha, uint16_t options,
 	if (req == NULL) {
 		qla_printk(KERN_WARNING, ha, "could not allocate memory"
 			"for request que\n");
-		goto que_failed;
+		return ENOMEM;
 	}
 
 	req->length = REQUEST_ENTRY_CNT_24XX;
@@ -659,7 +659,7 @@ qla25xx_create_rsp_que(struct qla_hw_data *ha, uint16_t options,
 	if (rsp == NULL) {
 		qla_printk(KERN_WARNING, ha, "could not allocate memory for"
 				" response que\n");
-		goto que_failed;
+		return ENOMEM;
 	}
 
 	rsp->length = RESPONSE_ENTRY_CNT_MQ;
-- 
1.6.2

Re: [PATCH] qla2xxx: Fix Null ptr dereference in fail path in queue create code

[Jiri Slaby]

On 09/25/2009 09:45 AM, Anirban Chakraborty wrote:
> Current code jumps to fail path in queue create functions and there it invokes 
> the queue free call with a (NULL) pointer to the queue which could not be 
> allocated. Fix it by returning ENOMEM directly without invoking the queue free 

Sorry, staring at callers now. They expect 0 on error. So both my and
your patches are wrong in this manner. There should be 'return 0'.