diff --git a/include/linux/slab.h b/include/linux/slab.h
index f30f3ade52cf4b9de2414432f4d72072af36675c..f810740fc9b6c24040eb9bd4b5c3a1ed19d42874 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -764,7 +764,7 @@ static inline __alloc_size(1, 2) void *kvcalloc(size_t n, size_t size, gfp_t fla
 extern void *kvrealloc(const void *p, size_t oldsize, size_t newsize, gfp_t flags)
 		      __realloc_size(3);
 extern void kvfree(const void *addr);
-DEFINE_FREE(kvfree, void *, if (_T) kvfree(_T))
+DEFINE_FREE(kvfree, void *, if (!IS_ERR_OR_NULL(_T)) kvfree(_T))
 
 extern void kvfree_sensitive(const void *addr, size_t len);