]> git.baikalelectronics.ru Git - kernel.git/commitdiff
mm/zsmalloc: do not attempt to free IS_ERR handle
authorSergey Senozhatsky <senozhatsky@chromium.org>
Tue, 16 Aug 2022 05:09:06 +0000 (14:09 +0900)
committerAndrew Morton <akpm@linux-foundation.org>
Sun, 28 Aug 2022 21:02:44 +0000 (14:02 -0700)
zsmalloc() now returns ERR_PTR values as handles, which zram accidentally
can pass to zs_free().  Another bad scenario is when zcomp_compress()
fails - handle has default -ENOMEM value, and zs_free() will try to free
that "pointer value".

Add the missing check and make sure that zs_free() bails out when
ERR_PTR() is passed to it.

Link: https://lkml.kernel.org/r/20220816050906.2583956-1-senozhatsky@chromium.org
Fixes: 1e2938d4b321 ("zsmalloc: zs_malloc: return ERR_PTR on failure")
Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Nitin Gupta <ngupta@vflare.org>,
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/zsmalloc.c

index 34f784a1604b7a60153567767f715fa3371eb675..907c9b1e1e6147d7c16441a3a0ee0ac9c9decd24 100644 (file)
@@ -1487,7 +1487,7 @@ void zs_free(struct zs_pool *pool, unsigned long handle)
        struct size_class *class;
        enum fullness_group fullness;
 
-       if (unlikely(!handle))
+       if (IS_ERR_OR_NULL((void *)handle))
                return;
 
        /*