summaryrefslogtreecommitdiff
path: root/kerncompat.h
diff options
context:
space:
mode:
authorQu Wenruo <quwenruo@cn.fujitsu.com>2016-12-15 16:37:02 +0800
committerDavid Sterba <dsterba@suse.com>2016-12-21 16:29:06 +0100
commite0485281ed319d99bdae13acdd5c9aed014083d9 (patch)
tree91bcd7a0b99c1f3bd0b1e3d9ac40f480272a450d /kerncompat.h
parente27189a39163e6d6d6781fdec55ae6ee11671839 (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 'kerncompat.h')
-rw-r--r--kerncompat.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/kerncompat.h b/kerncompat.h
index e374614c..19ed3fc0 100644
--- a/kerncompat.h
+++ b/kerncompat.h
@@ -244,11 +244,16 @@ static inline long PTR_ERR(const void *ptr)
return (long) ptr;
}
-static inline long IS_ERR(const void *ptr)
+static inline int IS_ERR(const void *ptr)
{
return IS_ERR_VALUE((unsigned long)ptr);
}
+static inline int IS_ERR_OR_NULL(const void *ptr)
+{
+ return !ptr || IS_ERR(ptr);
+}
+
/*
* This looks more complex than it should be. But we need to
* get the type for the ~ right in round_down (it needs to be