Commit 6fffcfa7 authored Oct 18, 2013 by Kevin Hilman Committed by Greg Kroah-Hartman Oct 25, 2013

devres: restore zeroing behavior of devres_alloc()



commit 64c862a8 (devres: add kernel standard devm_k.alloc functions) changed
the default behavior of alloc_dr() to no longer zero the allocated memory.  However,
only the devm.k.alloc() function were modified to pass in __GFP_ZERO which leaves
any users of devres_alloc() or __devres_alloc() with potentially wrong assumptions
about memory being zero'd upon allocation.

To fix, add __GFP_ZERO to devres_alloc() calls to preserve previous
behavior of zero'ing memory upon allocation.

Signed-off-by: Kevin Hilman <khilman@linaro.org>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent b9c06225

drivers/base/devres.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -111,7 +111,7 @@ void * __devres_alloc(dr_release_t release, size_t size, gfp_t gfp,
		{
		struct devres *dr;

		dr = alloc_dr(release, size, gfp);
		dr = alloc_dr(release, size, gfp \| __GFP_ZERO);
		if (unlikely(!dr))
		return NULL;
		set_node_dbginfo(&dr->node, name, size);
		@@ -136,7 +136,7 @@ void * devres_alloc(dr_release_t release, size_t size, gfp_t gfp)
		{
		struct devres *dr;

		dr = alloc_dr(release, size, gfp);
		dr = alloc_dr(release, size, gfp \| __GFP_ZERO);
		if (unlikely(!dr))
		return NULL;
		return dr->data;

Admin message