summaryrefslogtreecommitdiff
path: root/lib/flex_array.c
diff options
context:
space:
mode:
authorChangli Gao <xiaosuo@gmail.com>2010-04-23 13:17:45 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-12 14:57:00 -0700
commit669805f0492eb6415a6c621fcd1ef6e29fee32b8 (patch)
tree35dd10d256802ffad4a8f31840f9e2c13fea5364 /lib/flex_array.c
parentfb85b86ad4989b8d3aa5cbb2aafc9568a22fd3ce (diff)
flex_array: fix the panic when calling flex_array_alloc() without __GFP_ZERO
commit e59464c735db19619cde2aa331609adb02005f5b upstream. memset() is called with the wrong address and the kernel panics. Signed-off-by: Changli Gao <xiaosuo@gmail.com> Cc: Patrick McHardy <kaber@trash.net> Acked-by: David Rientjes <rientjes@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'lib/flex_array.c')
-rw-r--r--lib/flex_array.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/flex_array.c b/lib/flex_array.c
index 66eef2e4483e..41b1804fa728 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;
}