From: Dan Carpenter <error27@gmail.com>
Date: Sun, 19 Apr 2009 16:07:47 +0000 (+0300)
Subject: [SCSI] libosd: fix potential ERR_PTR dereference in osd_initiator.c
X-Git-Tag: v2.6.30-rc5~53^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bf5e84f69618f416e89a5a53434a8c865e70252e;p=profile%2Fivi%2Fkernel-x86-ivi.git

[SCSI] libosd: fix potential ERR_PTR dereference in osd_initiator.c

bio_map_kern() returns an ERR_PTR() not NULL.

Found by smatch (http://repo.or.cz/w/smatch.git).  Compile tested.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
---

diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c
index 2a5f077..76de889 100644
--- a/drivers/scsi/osd/osd_initiator.c
+++ b/drivers/scsi/osd/osd_initiator.c
@@ -612,9 +612,9 @@ static int _osd_req_list_objects(struct osd_request *or,
 
 	WARN_ON(or->in.bio);
 	bio = bio_map_kern(q, list, len, or->alloc_flags);
-	if (!bio) {
+	if (IS_ERR(bio)) {
 		OSD_ERR("!!! Failed to allocate list_objects BIO\n");
-		return -ENOMEM;
+		return PTR_ERR(bio);
 	}
 
 	bio->bi_rw &= ~(1 << BIO_RW);