Skip to content

Commit ed8fd8d

Browse files
committed
Merge tag 'for-6.13-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fix from David Sterba: - handle d_path() errors when canonicalizing device mapper paths during device scan * tag 'for-6.13-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: btrfs: add the missing error handling inside get_canonical_dev_path
2 parents 619f0b6 + fe4de59 commit ed8fd8d

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

fs/btrfs/volumes.c

+4
Original file line numberDiff line numberDiff line change
@@ -797,6 +797,10 @@ static int get_canonical_dev_path(const char *dev_path, char *canonical)
797797
if (ret)
798798
goto out;
799799
resolved_path = d_path(&path, path_buf, PATH_MAX);
800+
if (IS_ERR(resolved_path)) {
801+
ret = PTR_ERR(resolved_path);
802+
goto out;
803+
}
800804
ret = strscpy(canonical, resolved_path, PATH_MAX);
801805
out:
802806
kfree(path_buf);

0 commit comments

Comments
 (0)