Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c7ed8ec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kmemleak-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux 

Trivial kmemleak bug-fixes:

 - Early logging doesn't stop when kmemleak is off by default.
 - Zero-size scanning areas should be ignored (currently it prints a
   warning).

* tag 'kmemleak-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux:
  kmemleak: Disable early logging when kmemleak is off by default
  kmemleak: Only scan non-zero-size areas
parents 7f06db34 b370d29e

mm/kmemleak.c

+2 −1
Original line number Diff line number Diff line
@@ -1036,7 +1036,7 @@ void __ref kmemleak_scan_area(const void *ptr, size_t size, gfp_t gfp) 
{

	pr_debug("%s(0x%p)\n", __func__, ptr);



	if (atomic_read(&kmemleak_enabled) && ptr && !IS_ERR(ptr))

	if (atomic_read(&kmemleak_enabled) && ptr && size && !IS_ERR(ptr))

		add_scan_area((unsigned long)ptr, size, gfp);

	else if (atomic_read(&kmemleak_early_log))

		log_early(KMEMLEAK_SCAN_AREA, ptr, size, 0);
@@ -1757,6 +1757,7 @@ void __init kmemleak_init(void) 


#ifdef CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF

	if (!kmemleak_skip_disable) {

		atomic_set(&kmemleak_early_log, 0);

		kmemleak_disable();

		return;

	}