Skip to contentSkip to conversation

scsi: cxgbi: add null check before pointer dereference

PATCH New Gustavo A. R. Silva 1 participant 1 message May 22, 2017 SCSI

lore
Share & tools
lore

Gustavo A. R. Silva

author
#0 lore raw

PATCH 1/1 scsi: cxgbi: add null check before pointer dereference

Add null check before dereferencing pointer _sg_ inside sg_next()

Addresses-Coverity-ID: 1364845

Signed-off-by Gustavo A. R. Silva <[email protected]>
---
 drivers/scsi/cxgbi/libcxgbi.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)
drivers/scsi/cxgbi/libcxgbi.c +11 -8
index bd7d39e..6119ddf 100644
@@ -1256,15 +1256,18 @@ void cxgbi_ddp_set_one_ppod(struct cxgbi_pagepod *ppod,
 		*sg_off = offset;
 	}
 
-	if (offset == len) {
-		offset = 0;
-		sg = sg_next(sg);
-		if (sg) {
-			addr = sg_dma_address(sg);
-			len = sg_dma_len(sg);
+	if (sg) {
+		if (offset == len) {
+			offset = 0;
+			sg = sg_next(sg);
+			if (sg) {
+				addr = sg_dma_address(sg);
+				len = sg_dma_len(sg);
+			}
 		}
-	}
-	ppod->addr[i] = sg ? cpu_to_be64(addr + offset) : 0ULL;
+		ppod->addr[i] = cpu_to_be64(addr + offset);
+	} else
+		ppod->addr[i] = 0ULL;
 }
 EXPORT_SYMBOL_GPL(cxgbi_ddp_set_one_ppod);
Signature · 1 line
2.5.0