diff options
| author | Dan Robertson <dan@dlrobertson.com> | 2021-06-10 14:52:42 +0300 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-23 00:09:06 +0300 |
| commit | 044c8c9e05bc87cdc610eb320e8fdc694f3866df (patch) | |
| tree | cc4e38cd36d9b8cef02a63f7355308aee4f600b1 /fs/bcachefs/fs.c | |
| parent | a49e9a0589d1828af787bacf0a1e18eca7facb88 (diff) | |
| download | linux-044c8c9e05bc87cdc610eb320e8fdc694f3866df.tar.xz | |
bcachefs: mount: fix null deref with null devname
- Fix null deref on mount when given a null device name.
- Move the dev_name checks to return EINVAL when it is invalid.
Signed-off-by: Dan Robertson <dan@dlrobertson.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/fs.c')
| -rw-r--r-- | fs/bcachefs/fs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/bcachefs/fs.c b/fs/bcachefs/fs.c index 99885fb97aa2..efb467316756 100644 --- a/fs/bcachefs/fs.c +++ b/fs/bcachefs/fs.c @@ -1325,9 +1325,6 @@ static char **split_devs(const char *_dev_name, unsigned *nr) char *dev_name = NULL, **devs = NULL, *s; size_t i, nr_devs = 0; - if (strlen(_dev_name) == 0) - return NULL; - dev_name = kstrdup(_dev_name, GFP_KERNEL); if (!dev_name) return NULL; @@ -1503,6 +1500,9 @@ static struct dentry *bch2_mount(struct file_system_type *fs_type, if (ret) return ERR_PTR(ret); + if (!dev_name || strlen(dev_name) == 0) + return ERR_PTR(-EINVAL); + devs = split_devs(dev_name, &nr_devs); if (!devs) return ERR_PTR(-ENOMEM); |