leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

devres: handle zero size in devm_kmalloc()

Browse Source 
Make devm_kmalloc() behave similarly to non-managed kmalloc(): return
ZERO_SIZE_PTR when requested size is 0. Update devm_kfree() to handle
this case.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Link: https://lore.kernel.org/r/20200629065008.27620-5-brgl@bgdev.pl
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bartosz Golaszewski 2020-06-29 08:50:06 +02:00 committed by Greg Kroah-Hartman
parent 67dd077239
commit cad064f1bd
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/base/devres.c
View File

@ -819,6 +819,9 @@ void *devm_kmalloc(struct device *dev, size_t size, gfp_t gfp)
{ {
struct devres *dr; struct devres *dr;
if (unlikely(!size))
return ZERO_SIZE_PTR;
/* use raw alloc_dr for kmalloc caller tracing */ /* use raw alloc_dr for kmalloc caller tracing */
dr = alloc_dr(devm_kmalloc_release, size, gfp, dev_to_node(dev)); dr = alloc_dr(devm_kmalloc_release, size, gfp, dev_to_node(dev));
if (unlikely(!dr)) if (unlikely(!dr))
@ -950,10 +953,10 @@ void devm_kfree(struct device *dev, const void *p)
int rc; int rc;
/* /*
* Special case: pointer to a string in .rodata returned by * Special cases: pointer to a string in .rodata returned by
* devm_kstrdup_const(). * devm_kstrdup_const() or NULL/ZERO ptr.
*/ */
if (unlikely(is_kernel_rodata((unsigned long)p))) if (unlikely(is_kernel_rodata((unsigned long)p) || ZERO_OR_NULL_PTR(p)))
return; return;
rc = devres_destroy(dev, devm_kmalloc_release, rc = devres_destroy(dev, devm_kmalloc_release,