public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-11-01 09:13:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bcachefs: Fix pool->alloc NULL pointer dereference

Browse source 
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: syzbot+2f3859bd28f20fa682e6@syzkaller.appspotmail.com
Signed-off-by: Alan Huang <mmpgouride@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Alan Huang 2025-06-15 13:41:22 +08:00 • committed by Kent Overstreet
parent d89a34b14d
commit 56be92c63f
2 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fs/bcachefs/bcachefs.h
View file

@ -767,7 +767,8 @@ struct btree_trans_buf {
x(sysfs) \ x(sysfs) \
x(btree_write_buffer) \ x(btree_write_buffer) \
x(btree_node_scrub) \ x(btree_node_scrub) \
x(async_recovery_passes) x(async_recovery_passes) \
x(ioctl_data)
enum bch_write_ref { enum bch_write_ref {
#define x(n) BCH_WRITE_REF_##n, #define x(n) BCH_WRITE_REF_##n,

29
fs/bcachefs/chardev.c
View file

@ -319,6 +319,7 @@ static int bch2_data_thread(void *arg)
ctx->stats.ret = BCH_IOCTL_DATA_EVENT_RET_done; ctx->stats.ret = BCH_IOCTL_DATA_EVENT_RET_done;
ctx->stats.data_type = (int) DATA_PROGRESS_DATA_TYPE_done; ctx->stats.data_type = (int) DATA_PROGRESS_DATA_TYPE_done;
} }
enumerated_ref_put(&ctx->c->writes, BCH_WRITE_REF_ioctl_data);
return 0; return 0;
} }
@ -378,15 +379,24 @@ static long bch2_ioctl_data(struct bch_fs *c,
struct bch_data_ctx *ctx; struct bch_data_ctx *ctx;
int ret; int ret;
if (!capable(CAP_SYS_ADMIN)) if (!enumerated_ref_tryget(&c->writes, BCH_WRITE_REF_ioctl_data))
return -EPERM; return -EROFS;
if (arg.op >= BCH_DATA_OP_NR || arg.flags) if (!capable(CAP_SYS_ADMIN)) {
return -EINVAL; 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); ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
if (!ctx) if (!ctx) {
return -ENOMEM; ret = -ENOMEM;
goto put_ref;
}
ctx->c = c; ctx->c = c;
ctx->arg = arg; ctx->arg = arg;
@ -395,7 +405,12 @@ static long bch2_ioctl_data(struct bch_fs *c,
&bcachefs_data_ops, &bcachefs_data_ops,
bch2_data_thread); bch2_data_thread);
if (ret < 0) 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; return ret;
} }