p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

zswap: potential NULL dereference on error in init_zswap() 

The "pool" pointer can be NULL at the end of the init_zswap().  (We
would allocate a new pool later in that situation)

So in the error handling then we need to make sure pool is a valid
pointer before calling "zswap_pool_destroy(pool);" because that function
dereferences the argument.

Link: http://lkml.kernel.org/r/20200114050902.og32fkllkod5ycf5@kili.mountain
Fixes: 93d4dfa9fbd0 ("mm/zswap.c: add allocation hysteresis if pool limit is hit")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Vitaly Wool <vitaly.wool@konsulko.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Dan Carpenter 2020-01-30 22:15:07 -08:00 committed by Linus Torvalds
parent 45190f01dd
commit 38aeb071b3
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mm/zswap.c
View File

@ -1359,7 +1359,8 @@ static int __init init_zswap(void)
return 0; return 0;
fallback_fail: fallback_fail:
zswap_pool_destroy(pool); if (pool)
zswap_pool_destroy(pool);
hp_fail: hp_fail:
cpuhp_remove_state(CPUHP_MM_ZSWP_MEM_PREPARE); cpuhp_remove_state(CPUHP_MM_ZSWP_MEM_PREPARE);
dstmem_fail: dstmem_fail: