bcachefs: Fix pool->alloc NULL pointer dereference
PATCH v2 1/1 bcachefs: Fix pool->alloc NULL pointer dereference
btree_interior_update_pool has not been initialized before the filesystem becomes read-write, thus mempool_alloc in bch2_btree_update_start will trigger pool->alloc NULL pointer dereference in mempool_alloc_noprof
Reported-by [email protected]
Signed-off-by Alan Huang <[email protected]>
--- fs/bcachefs/bcachefs.h | 3 ++- fs/bcachefs/chardev.c | 29 ++++++++++++++++++++++------- 2 files changed, 24 insertions(+), 8 deletions(-)
fs/bcachefs/bcachefs.h +2 -1
@@ -767,7 +767,8 @@ struct btree_trans_buf {x (sysfs) \x (btree_write_buffer ) \x (btree_node_scrub) \ -x (async_recovery_passes) +x (async_recovery_passes) \ +x (ioctl_data) enum bch_write_ref {#define x (n) BCH_WRITE_REF_##n,
fs/bcachefs/chardev.c +22 -7
@@ -319,6 +319,7 @@ static int bch2_data_thread(void *arg) ctx->stats.ret = BCH_IOCTL_DATA_EVENT_RET_done; ctx->stats.data_type = (int ) DATA_PROGRESS_DATA_TYPE_done; } +enumerated_ref_put (&ctx->c->writes, BCH_WRITE_REF_ioctl_data);return 0 ; }
@@ -378,15 +379,24 @@ static long bch2_ioctl_data(struct bch_fs *c,struct bch_data_ctx *ctx;int ret; -if (!capable (CAP_SYS_ADMIN )) -return -EPERM ; +if (!enumerated_ref_tryget (&c->writes, BCH_WRITE_REF_ioctl_data)) +return -EROFS ; -if (arg.op >=BCH_DATA_OP_NR || arg.flags) -return -EINVAL ; +if (!capable (CAP_SYS_ADMIN )) { + ret = -EPERM ; + goto put_ref; + } + +if (arg.op >=BCH_DATA_OP_NR || arg.flags) { + ret = -EINVAL ; + goto put_ref; + } ctx =kzalloc (sizeof (*ctx),GFP_KERNEL ); -if (!ctx) -return -ENOMEM ; +if (!ctx) { + ret = -ENOMEM ; + goto put_ref; + } ctx->c = c; ctx->arg = arg;
@@ -395,7 +405,12 @@ static long bch2_ioctl_data(struct bch_fs *c, &bcachefs_data_ops, bch2_data_thread);if (ret <0 ) -kfree (ctx); + goto cleanup; +return ret; +cleanup: +kfree (ctx); +put_ref: +enumerated_ref_put (&c->writes, BCH_WRITE_REF_ioctl_data);return ret; }
Signature · 1 line
2.48.1