diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-05 12:22:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-05 12:22:39 -0700 |
| commit | 3c5c9b7cfd7d2a2b1e32c2284c82164c1aaa919f (patch) | |
| tree | 16e2a65036143f0309bd1cc2135570719f573d07 /mm/util.c | |
| parent | 6155a3b88573757de2649197af30f0e71a12aafe (diff) | |
| parent | f4b4f3ec1a310c3de9797271a9c06b7499470d69 (diff) | |
| download | linux-3c5c9b7cfd7d2a2b1e32c2284c82164c1aaa919f.tar.gz linux-3c5c9b7cfd7d2a2b1e32c2284c82164c1aaa919f.tar.bz2 linux-3c5c9b7cfd7d2a2b1e32c2284c82164c1aaa919f.zip | |
Merge tag 'mm-hotfixes-stable-2023-09-05-11-51' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Pull misc fixes from Andrew Morton:
"Seven hotfixes. Four are cc:stable and the remainder pertain to issues
which were introduced in the current merge window"
* tag 'mm-hotfixes-stable-2023-09-05-11-51' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
sparc64: add missing initialization of folio in tlb_batch_add()
mm: memory-failure: use rcu lock instead of tasklist_lock when collect_procs()
revert "memfd: improve userspace warnings for missing exec-related flags".
rcu: dump vmalloc memory info safely
mm/vmalloc: add a safer version of find_vm_area() for debug
tools/mm: fix undefined reference to pthread_once
memcontrol: ensure memcg acquired by id is properly set up
Diffstat (limited to 'mm/util.c')
| -rw-r--r-- | mm/util.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/util.c b/mm/util.c index f08b655da917..8cbbfd3a3d59 100644 --- a/mm/util.c +++ b/mm/util.c @@ -1068,7 +1068,9 @@ void mem_dump_obj(void *object) if (vmalloc_dump_obj(object)) return; - if (virt_addr_valid(object)) + if (is_vmalloc_addr(object)) + type = "vmalloc memory"; + else if (virt_addr_valid(object)) type = "non-slab/vmalloc memory"; else if (object == NULL) type = "NULL pointer"; |