]> granicus.if.org Git - zfs/commitdiff
Matching kmem_free() fix for use after free case.
authorBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 19 Feb 2009 20:28:10 +0000 (12:28 -0800)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 19 Feb 2009 20:28:10 +0000 (12:28 -0800)
See commit bb01879ebe5ba5d8e2c2177d3b1ce0272c17ce07 for a full
description.  This issue should have been addressed in the same
commit but it slipped my mind.

include/sys/kmem.h

index 278039ec9042b9faba5079d450bcba25dd445494..318cf5ee88cc3cae825c598d3391673bc0f40504 100644 (file)
@@ -126,9 +126,9 @@ extern void vmem_free_debug(void *ptr, size_t size);
 
 #else /* DEBUG_KMEM */
 
-# define kmem_alloc(size, flags)        kmalloc((size), (flags))
-# define kmem_zalloc(size, flags)       kzalloc((size), (flags))
-# define kmem_free(ptr, size)           (kfree(ptr), (void)(size))
+# define kmem_alloc(size, flags)              kmalloc((size), (flags))
+# define kmem_zalloc(size, flags)             kzalloc((size), (flags))
+# define kmem_free(ptr, size)                 ((void)(size), kfree(ptr))
 
 # ifdef HAVE_KMALLOC_NODE
 #  define kmem_alloc_node(size, flags, node)                                  \
@@ -138,8 +138,8 @@ extern void vmem_free_debug(void *ptr, size_t size);
           kmalloc((size), (flags))
 # endif
 
-# define vmem_alloc(size, flags)        __vmalloc((size), ((flags) |          \
-                                            __GFP_HIGHMEM), PAGE_KERNEL)
+# define vmem_alloc(size, flags)              __vmalloc((size), ((flags) |    \
+                                                  __GFP_HIGHMEM), PAGE_KERNEL)
 # define vmem_zalloc(size, flags)                                             \
 ({                                                                            \
         void *_ptr_ = __vmalloc((size),((flags)|__GFP_HIGHMEM),PAGE_KERNEL);  \