Skip to content

Commit ca6c2ce

Browse files
Baoquan Heakpm00
authored andcommitted
mm/vmalloc: fix the unchecked dereference warning in vread_iter()
LKP reported smatch warning as below: =================== smatch warnings: mm/vmalloc.c:3689 vread_iter() error: we previously assumed 'vm' could be null (see line 3667) ...... 06c8994 @3667 size = vm ? get_vm_area_size(vm) : va_size(va); ...... 06c8994 @3689 else if (!(vm->flags & VM_IOREMAP)) ^^^^^^^^^ Unchecked dereference ===================== This is not a runtime bug because the possible null 'vm' in the pointed place could only happen when flags == VMAP_BLOCK. However, the case 'flags == VMAP_BLOCK' should never happen and has been detected with WARN_ON. Please check vm_map_ram() implementation and the earlier checking in vread_iter() at below: ~~~~~~~~~~~~~~~~~~~~~~~~~~ /* * VMAP_BLOCK indicates a sub-type of vm_map_ram area, need * be set together with VMAP_RAM. */ WARN_ON(flags == VMAP_BLOCK); if (!vm && !flags) continue; ~~~~~~~~~~~~~~~~~~~~~~~~~~ So add checking on whether 'vm' could be null when dereferencing it in vread_iter(). This mutes smatch complaint. Link: https://lkml.kernel.org/r/ZTCURc8ZQE+KrTvS@MiWiFi-R3L-srv Link: https://lkml.kernel.org/r/ZS/2k6DIMd0tZRgK@MiWiFi-R3L-srv Signed-off-by: Baoquan He <[email protected]> Reported-by: kernel test robot <[email protected]> Reported-by: Dan Carpenter <[email protected]> Closes: https://lore.kernel.org/r/[email protected]/ Cc: Lorenzo Stoakes <[email protected]> Cc: Philip Li <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent cb61dad commit ca6c2ce

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

mm/vmalloc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3809,7 +3809,7 @@ long vread_iter(struct iov_iter *iter, const char *addr, size_t count)
38093809

38103810
if (flags & VMAP_RAM)
38113811
copied = vmap_ram_vread_iter(iter, addr, n, flags);
3812-
else if (!(vm->flags & VM_IOREMAP))
3812+
else if (!(vm && (vm->flags & VM_IOREMAP)))
38133813
copied = aligned_vread_iter(iter, addr, n);
38143814
else /* IOREMAP area is treated as memory hole */
38153815
copied = zero_iter(iter, n);

0 commit comments

Comments
 (0)