Skip to content

Commit b2e382a

Browse files
Liequan Cheaxboe
authored andcommitted
bcache: revert replacing IS_ERR_OR_NULL with IS_ERR again
Commit 028ddca ("bcache: Remove unnecessary NULL point check in node allocations") leads a NULL pointer deference in cache_set_flush(). 1721 if (!IS_ERR_OR_NULL(c->root)) 1722 list_add(&c->root->list, &c->btree_cache); >From the above code in cache_set_flush(), if previous registration code fails before allocating c->root, it is possible c->root is NULL as what it is initialized. __bch_btree_node_alloc() never returns NULL but c->root is possible to be NULL at above line 1721. This patch replaces IS_ERR() by IS_ERR_OR_NULL() to fix this. Fixes: 028ddca ("bcache: Remove unnecessary NULL point check in node allocations") Signed-off-by: Liequan Che <[email protected]> Cc: [email protected] Cc: Zheng Wang <[email protected]> Reviewed-by: Mingzhe Zou <[email protected]> Signed-off-by: Coly Li <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
1 parent 3c93e4e commit b2e382a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/md/bcache/super.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1718,7 +1718,7 @@ static CLOSURE_CALLBACK(cache_set_flush)
17181718
if (!IS_ERR_OR_NULL(c->gc_thread))
17191719
kthread_stop(c->gc_thread);
17201720

1721-
if (!IS_ERR(c->root))
1721+
if (!IS_ERR_OR_NULL(c->root))
17221722
list_add(&c->root->list, &c->btree_cache);
17231723

17241724
/*

0 commit comments

Comments
 (0)