Skip to content

Commit cd7eb8f

Browse files
Dan Carpentertehcaster
authored andcommitted
mm/slab: make __free(kfree) accept error pointers
Currently, if an automatically freed allocation is an error pointer that will lead to a crash. An example of this is in wm831x_gpio_dbg_show(). 171 char *label __free(kfree) = gpiochip_dup_line_label(chip, i); 172 if (IS_ERR(label)) { 173 dev_err(wm831x->dev, "Failed to duplicate label\n"); 174 continue; 175 } The auto clean up function should check for error pointers as well, otherwise we're going to keep hitting issues like this. Fixes: 54da6a0 ("locking: Introduce __cleanup() based infrastructure") Cc: <[email protected]> Signed-off-by: Dan Carpenter <[email protected]> Acked-by: David Rientjes <[email protected]> Signed-off-by: Vlastimil Babka <[email protected]>
1 parent 8f828aa commit cd7eb8f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

include/linux/slab.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ void kfree(const void *objp);
266266
void kfree_sensitive(const void *objp);
267267
size_t __ksize(const void *objp);
268268

269-
DEFINE_FREE(kfree, void *, if (_T) kfree(_T))
269+
DEFINE_FREE(kfree, void *, if (!IS_ERR_OR_NULL(_T)) kfree(_T))
270270

271271
/**
272272
* ksize - Report actual allocation size of associated object
@@ -792,7 +792,7 @@ static inline __alloc_size(1, 2) void *kvcalloc(size_t n, size_t size, gfp_t fla
792792
extern void *kvrealloc(const void *p, size_t oldsize, size_t newsize, gfp_t flags)
793793
__realloc_size(3);
794794
extern void kvfree(const void *addr);
795-
DEFINE_FREE(kvfree, void *, if (_T) kvfree(_T))
795+
DEFINE_FREE(kvfree, void *, if (!IS_ERR_OR_NULL(_T)) kvfree(_T))
796796

797797
extern void kvfree_sensitive(const void *addr, size_t len);
798798

0 commit comments

Comments
 (0)