diff options
| author | Qu Wenruo <wqu@suse.com> | 2025-01-08 04:44:04 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2025-01-13 21:39:52 +0100 |
| commit | fe4de594f7a2e9bc49407de60fbd20809fad4192 (patch) | |
| tree | b8d5042f9c075eceb1aec2006d209b6ebfb1dce0 /fs | |
| parent | btrfs: zlib: fix avail_in bytes for s390 zlib HW compression path (diff) | |
| download | linux-fe4de594f7a2e9bc49407de60fbd20809fad4192.tar.xz linux-fe4de594f7a2e9bc49407de60fbd20809fad4192.zip | |
btrfs: add the missing error handling inside get_canonical_dev_path
Inside function get_canonical_dev_path(), we call d_path() to get the
final device path.
But d_path() can return error, and in that case the next strscpy() call
will trigger an invalid memory access.
Add back the missing error handling for d_path().
Reported-by: Boris Burkov <boris@bur.io>
Fixes: 7e06de7c83a7 ("btrfs: canonicalize the device path before adding it")
Signed-off-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/volumes.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 1cccaf9c2b0d..3d0ac8bdb21f 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -797,6 +797,10 @@ static int get_canonical_dev_path(const char *dev_path, char *canonical) if (ret) goto out; resolved_path = d_path(&path, path_buf, PATH_MAX); + if (IS_ERR(resolved_path)) { + ret = PTR_ERR(resolved_path); + goto out; + } ret = strscpy(canonical, resolved_path, PATH_MAX); out: kfree(path_buf); |