commit ea3810a20e94ea8840d5ec520dcdcec0da620c19
author Linux Build Service Account <lnxbuild@localhost> Fri Dec 27 02:32:54 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Dec 27 02:32:54 2013 -0800
tree 27f792ed277ce838743072db92636aa537be6175
parent c02106ec74949f8221569dcf012bad8698393201
parent d4b6059003c222a62b9dba184d0bd7fe52b984df

Merge "msm: kgsl: Protect against a potential overflow in kgsl_sg_alloc"

drivers/gpu/msm/kgsl_sharedmem.h

diff --git a/drivers/gpu/msm/kgsl_sharedmem.h b/drivers/gpu/msm/kgsl_sharedmem.h
index b08c6d6..eff7ea7 100644
--- a/drivers/gpu/msm/kgsl_sharedmem.h
+++ b/drivers/gpu/msm/kgsl_sharedmem.h
@@ -138,6 +138,9 @@
 
 static inline void *kgsl_sg_alloc(unsigned int sglen)
 {
+	if (sglen >= ULONG_MAX / sizeof(struct scatterlist))
+		return NULL;
+
 	if ((sglen * sizeof(struct scatterlist)) <  PAGE_SIZE)
 		return kzalloc(sglen * sizeof(struct scatterlist), GFP_KERNEL);
 	else {