Skip to content

Commit 6c82012

Browse files
leejunilelektroschmock
authored andcommitted
zsmalloc: fix migrate_zspage-zs_free race condition
commit c102f07ca0b04f2cb49cfc161c83f6239d17f491 upstream. record_obj() in migrate_zspage() does not preserve handle's HANDLE_PIN_BIT, set by find_aloced_obj()->trypin_tag(), and implicitly (accidentally) un-pins the handle, while migrate_zspage() still performs an explicit unpin_tag() on the that handle. This additional explicit unpin_tag() introduces a race condition with zs_free(), which can pin that handle by this time, so the handle becomes un-pinned. Schematically, it goes like this: CPU0 CPU1 migrate_zspage find_alloced_obj trypin_tag set HANDLE_PIN_BIT zs_free() pin_tag() obj_malloc() -- new object, no tag record_obj() -- remove HANDLE_PIN_BIT set HANDLE_PIN_BIT unpin_tag() -- remove zs_free's HANDLE_PIN_BIT The race condition may result in a NULL pointer dereference: Unable to handle kernel NULL pointer dereference at virtual address 00000000 CPU: 0 PID: 19001 Comm: CookieMonsterCl Tainted: PC is at get_zspage_mapping+0x0/0x24 LR is at obj_free.isra.22+0x64/0x128 Call trace: get_zspage_mapping+0x0/0x24 zs_free+0x88/0x114 zram_free_page+0x64/0xcc zram_slot_free_notify+0x90/0x108 swap_entry_free+0x278/0x294 free_swap_and_cache+0x38/0x11c unmap_single_vma+0x480/0x5c8 unmap_vmas+0x44/0x60 exit_mmap+0x50/0x110 mmput+0x58/0xe0 do_exit+0x320/0x8dc do_group_exit+0x44/0xa8 get_signal+0x538/0x580 do_signal+0x98/0x4b8 do_notify_resume+0x14/0x5c This patch keeps the lock bit in migration path and update value atomically. Signed-off-by: Junil Lee <[email protected]> Signed-off-by: Minchan Kim <[email protected]> Acked-by: Vlastimil Babka <[email protected]> Cc: Sergey Senozhatsky <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Lee Jones <[email protected]> Change-Id: Ic8d4d24f97941c520b85f79308cc09f8c10110fd
1 parent 03e6db3 commit 6c82012

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

mm/zsmalloc.c

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,12 @@ static void free_handle(struct zs_pool *pool, unsigned long handle)
297297

298298
static void record_obj(unsigned long handle, unsigned long obj)
299299
{
300-
*(unsigned long *)handle = obj;
300+
/*
301+
* lsb of @obj represents handle lock while other bits
302+
* represent object value the handle is pointing so
303+
* updating shouldn't do store tearing.
304+
*/
305+
WRITE_ONCE(*(unsigned long *)handle, obj);
301306
}
302307

303308
/* zpool driver */
@@ -1614,6 +1619,13 @@ static int migrate_zspage(struct zs_pool *pool, struct size_class *class,
16141619
free_obj = obj_malloc(d_page, class, handle);
16151620
zs_object_copy(free_obj, used_obj, class);
16161621
index++;
1622+
/*
1623+
* record_obj updates handle's value to free_obj and it will
1624+
* invalidate lock bit(ie, HANDLE_PIN_BIT) of handle, which
1625+
* breaks synchronization using pin_tag(e,g, zs_free) so
1626+
* let's keep the lock bit.
1627+
*/
1628+
free_obj |= BIT(HANDLE_PIN_BIT);
16171629
record_obj(handle, free_obj);
16181630
unpin_tag(handle);
16191631
obj_free(pool, class, used_obj);

0 commit comments

Comments
 (0)