flex_array: fix the panic when calling flex_array_alloc() without __GFP_ZERO

e59464c7 · Changli Gao <[email protected]> · 2010-04-23 13:17:45 -04:00

memset() is called with the wrong address and the kernel panics.

Signed-off-by: Changli Gao <[email protected]>
Cc: Patrick McHardy <[email protected]>
Acked-by: David Rientjes <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

Commit: e59464c735db19619cde2aa331609adb02005f5b
Parents: 46da2766

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
lib/flex_array.c	modified	+1	−1	View file

lib/flex_array.c

View file

diff --git a/lib/flex_array.c b/lib/flex_array.c
index 66eef2e..41b1804 100644
--- a/lib/flex_array.c
+++ b/lib/flex_array.c
@@ -99,7 +99,7 @@ struct flex_array *flex_array_alloc(int element_size, unsigned int total,
 	ret->element_size = element_size;
 	ret->total_nr_elements = total;
 	if (elements_fit_in_base(ret) && !(flags & __GFP_ZERO))
-		memset(ret->parts[0], FLEX_ARRAY_FREE,
+		memset(&ret->parts[0], FLEX_ARRAY_FREE,
 						FLEX_ARRAY_BASE_BYTES_LEFT);
 	return ret;
 }