diff options
| author | Qu Wenruo <quwenruo@cn.fujitsu.com> | 2016-12-15 16:37:02 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-12-21 16:29:06 +0100 |
| commit | e0485281ed319d99bdae13acdd5c9aed014083d9 (patch) | |
| tree | 91bcd7a0b99c1f3bd0b1e3d9ac40f480272a450d /cmds-receive.c | |
| parent | e27189a39163e6d6d6781fdec55ae6ee11671839 (diff) | |
btrfs-progs: Fix NULL pointer when receive clone operation
Regression introduced by a2f7af94abe4a3491ca1280a2ae1d63edc0d62ab
"btrfs-progs: subvol_uuid_search: return error encoded pointer"
IS_ERR() will only check if it's an error code, won't check if it's
NULL. And for all the caller the commit modifies, it can return NULL
and makes cause segfault.
Fix it by introducing new IS_ERR_OR_NULL() macro, and for NULL pointer
and needs to return int case, convert NULL pointer to -ENOENT.
Reported-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
Tested-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'cmds-receive.c')
| -rw-r--r-- | cmds-receive.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/cmds-receive.c b/cmds-receive.c index cb42aa27..166d37dc 100644 --- a/cmds-receive.c +++ b/cmds-receive.c @@ -287,13 +287,16 @@ static int process_snapshot(const char *path, const u8 *uuid, u64 ctransid, parent_subvol = subvol_uuid_search(&rctx->sus, 0, parent_uuid, parent_ctransid, NULL, subvol_search_by_received_uuid); - if (IS_ERR(parent_subvol)) { + if (IS_ERR_OR_NULL(parent_subvol)) { parent_subvol = subvol_uuid_search(&rctx->sus, 0, parent_uuid, parent_ctransid, NULL, subvol_search_by_uuid); } - if (IS_ERR(parent_subvol)) { - ret = PTR_ERR(parent_subvol); + if (IS_ERR_OR_NULL(parent_subvol)) { + if (!parent_subvol) + ret = -ENOENT; + else + ret = PTR_ERR(parent_subvol); error("cannot find parent subvolume"); goto out; } @@ -750,13 +753,16 @@ static int process_clone(const char *path, u64 offset, u64 len, si = subvol_uuid_search(&rctx->sus, 0, clone_uuid, clone_ctransid, NULL, subvol_search_by_received_uuid); - if (IS_ERR(si)) { + if (IS_ERR_OR_NULL(si)) { if (memcmp(clone_uuid, rctx->cur_subvol.received_uuid, BTRFS_UUID_SIZE) == 0) { /* TODO check generation of extent */ subvol_path = strdup(rctx->cur_subvol_path); } else { - ret = PTR_ERR(si); + if (!si) + ret = -ENOENT; + else + ret = PTR_ERR(si); error("clone: did not find source subvol"); goto out; } |